Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] pavucontrol: update to 5.0.
@ 2021-08-16 13:20 ardadem
  2021-08-25  5:13 ` [PR PATCH] [Updated] " ardadem
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: ardadem @ 2021-08-16 13:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2422 bytes --]

There is a new pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-pavucontrol-5
https://github.com/void-linux/void-packages/pull/32510

pavucontrol: update to 5.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

```
Changes:

Support for switching Bluetooth codecs (new in PulseAudio 15.0).
Support for locking card profiles (new in PulseAudio 15.0). Locking a profile prevents PulseAudio from automatically switching away from that profile on plug/unplug events.
New translations: Asturian, Basque, Belarusian, Galician, Hebrew, Kazakh, Norwegian Bokmål, Sinhala, Slovenian
Updated translations: Catalan, Chinese (Simplified), Chinese (Traditional), Croatian, Danish, Dutch, Finnish, French, German, Hungarian, Italian, Japanese, Korean, Lithuanian, Norwegian Nynorsk, Polish, Portugese, Portugese (Brazil), Slovak, Spanish, Swedish, Turkish, Ukrainian.
Some bug fixes.
New dependency: json-glib.
Minimum gtkmm version bumped to 3.22.
```

We should merge it after Pulseaudio 15 since it's required for all new features.

A patch file from https://github.com/void-linux/void-packages/pull/32510.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-pavucontrol-5-32510.patch --]
[-- Type: text/x-diff, Size: 14858 bytes --]

From 561ba80b6a3aba3080b1cf20e472bc673e10df68 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 16 Aug 2021 16:15:31 +0300
Subject: [PATCH] pavucontrol: update to 5.0.

---
 .../pavucontrol/patches/fix-segfault.patch    | 319 ------------------
 srcpkgs/pavucontrol/template                  |   9 +-
 2 files changed, 5 insertions(+), 323 deletions(-)
 delete mode 100644 srcpkgs/pavucontrol/patches/fix-segfault.patch

diff --git a/srcpkgs/pavucontrol/patches/fix-segfault.patch b/srcpkgs/pavucontrol/patches/fix-segfault.patch
deleted file mode 100644
index fe7fcba5ccc7..000000000000
--- a/srcpkgs/pavucontrol/patches/fix-segfault.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Upstream: yes, not released.
-
-Remove configure.ac changes to avoid need to reconfigure.
-We know we have the necessary version of its dependencies.
-
-From 284082551938b65e71d06bda793fedbd4a4f41ab Mon Sep 17 00:00:00 2001
-From: Felipe Sateler <fsateler@gmail.com>
-Date: Sat, 28 Dec 2019 12:39:38 -0300
-Subject: [PATCH] Migrate away from deprecated Gtk interfaces
-
-This was accomplished by building with -DGTKMM_DISABLE_DEPRECATED.
----
- configure.ac           |  2 +-
- src/channelwidget.h    |  2 +-
- src/devicewidget.cc    |  6 +++---
- src/mainwindow.cc      | 12 ++++++------
- src/pavuapplication.cc | 22 +++++++++++++++-------
- src/pavuapplication.h  |  2 ++
- src/pavucontrol.cc     |  7 ++++---
- src/pavucontrol.glade  | 24 ++++++++++++------------
- src/sinkwidget.h       |  2 +-
- src/streamwidget.cc    |  2 +-
- 10 files changed, 46 insertions(+), 35 deletions(-)
-
-diff --git a/src/channelwidget.h b/src/channelwidget.h
-index c9c5c9d..6216b74 100644
---- a/src/channelwidget.h
-+++ b/src/channelwidget.h
-@@ -38,7 +38,7 @@ public:
- 
-     Gtk::Label *channelLabel;
-     Gtk::Label *volumeLabel;
--    Gtk::HScale *volumeScale;
-+    Gtk::Scale *volumeScale;
- 
-     int channel;
-     MinimalStreamWidget *minimalStreamWidget;
-diff --git a/src/devicewidget.cc b/src/devicewidget.cc
-index e1b1869..dd41487 100644
---- a/src/devicewidget.cc
-+++ b/src/devicewidget.cc
-@@ -227,7 +227,7 @@ void DeviceWidget::prepareMenu() {
- 
- bool DeviceWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
- 
-@@ -259,8 +259,8 @@ void DeviceWidget::renamePopup() {
-     x->get_widget("renameText", renameText);
- 
-     renameText->set_text(description);
--    dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
--    dialog->add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
-+    dialog->add_button("_Cancel", Gtk::RESPONSE_CANCEL);
-+    dialog->add_button("_OK", Gtk::RESPONSE_OK);
-     dialog->set_default_response(Gtk::RESPONSE_OK);
-     if (Gtk::RESPONSE_OK == dialog->run()) {
-         pa_operation* o;
-diff --git a/src/mainwindow.cc b/src/mainwindow.cc
-index f3d8620..e1a0a82 100644
---- a/src/mainwindow.cc
-+++ b/src/mainwindow.cc
-@@ -95,11 +95,11 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
-     x->get_widget("notebook", notebook);
-     x->get_widget("showVolumeMetersCheckButton", showVolumeMetersCheckButton);
- 
--    cardsVBox->set_reallocate_redraws(true);
--    sourcesVBox->set_reallocate_redraws(true);
--    streamsVBox->set_reallocate_redraws(true);
--    recsVBox->set_reallocate_redraws(true);
--    sinksVBox->set_reallocate_redraws(true);
-+    sourcesVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sourcesVBox->queue_draw(); });
-+    cardsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ cardsVBox->queue_draw(); });
-+    streamsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ streamsVBox->queue_draw(); });
-+    recsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ recsVBox->queue_draw(); });
-+    sinksVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sinksVBox->queue_draw(); });
- 
-     sinkInputTypeComboBox->set_active((int) showSinkInputType);
-     sourceOutputTypeComboBox->set_active((int) showSourceOutputType);
-@@ -222,7 +222,7 @@ bool MainWindow::on_key_press_event(GdkEventKey* event) {
-             case GDK_KEY_Q:
-             case GDK_KEY_w:
-             case GDK_KEY_q:
--                Gtk::Main::quit();
-+                this->get_application()->quit();
-                 return true;
-         }
-     }
-diff --git a/src/pavuapplication.cc b/src/pavuapplication.cc
-index 2ff5739..6773b53 100644
---- a/src/pavuapplication.cc
-+++ b/src/pavuapplication.cc
-@@ -30,6 +30,14 @@
- #include "pavucontrol.h"
- #include "mainwindow.h"
- 
-+static PavuApplication globalInstance;
-+
-+PavuApplication&
-+PavuApplication::get_instance()
-+{
-+    return globalInstance;
-+}
-+
- PavuApplication::PavuApplication() :
-     Gtk::Application("org.pulseaudio.pavucontrol", Gio::ApplicationFlags::APPLICATION_HANDLES_COMMAND_LINE),
-     mainWindow(NULL),
-@@ -143,26 +151,26 @@ int main(int argc, char *argv[]) {
-     signal(SIGPIPE, SIG_IGN);
- 
-     /* Create the application */
--    auto app = PavuApplication();
-+    globalInstance = PavuApplication();
- 
-     /* Add command-line options */
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_INT,
-         "tab", 't',
-         _("Select a specific tab on load."),
-         _("number"));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "retry", 'r',
-         _("Retry forever if pa quits (every 5 seconds)."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "maximize", 'm',
-         _("Maximize the window."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "version", 'v',
-         _("Show version."));
-@@ -170,7 +178,7 @@ int main(int argc, char *argv[]) {
-     /* Connect to the "on_command_line" signal which is fired
-      * when the application receives command-line arguments
-      */
--    app.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &app), false);
-+    globalInstance.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &globalInstance), false);
- 
-     /* Run the application.
-      * In the first launched instance, this will return when its window is
-@@ -179,5 +187,5 @@ int main(int argc, char *argv[]) {
-      * Handling a new request consists of presenting the existing window (and
-      * optionally, select a tab).
-      */
--    return app.run(argc, argv);
-+    return globalInstance.run(argc, argv);
- }
-diff --git a/src/pavuapplication.h b/src/pavuapplication.h
-index 3589c5d..d2a1f5a 100644
---- a/src/pavuapplication.h
-+++ b/src/pavuapplication.h
-@@ -37,6 +37,8 @@ public:
-     gint32 tab;
-     bool version;
- 
-+    static PavuApplication& get_instance();
-+
- protected:
-     // Override default signal handlers:
-     void on_activate() override;
-diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
-index 6981707..bcdde8e 100644
---- a/src/pavucontrol.cc
-+++ b/src/pavucontrol.cc
-@@ -40,6 +40,7 @@
- #include "sourceoutputwidget.h"
- #include "rolewidget.h"
- #include "mainwindow.h"
-+#include "pavuapplication.h"
- 
- static pa_context* context = NULL;
- static pa_mainloop_api* api = NULL;
-@@ -56,7 +57,7 @@ void show_error(const char *txt) {
-     Gtk::MessageDialog dialog(buf, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
-     dialog.run();
- 
--    Gtk::Main::quit();
-+    PavuApplication::get_instance().quit();
- }
- 
- static void dec_outstanding(MainWindow *w) {
-@@ -571,7 +572,7 @@ void context_state_callback(pa_context *c, void *userdata) {
- 
-         case PA_CONTEXT_TERMINATED:
-         default:
--            Gtk::Main::quit();
-+            w->get_application()->quit();
-             return;
-     }
- }
-@@ -613,7 +614,7 @@ gboolean connect_to_pulse(gpointer userdata) {
-         else {
-             if(!retry) {
-                 reconnect_timeout = -1;
--                Gtk::Main::quit();
-+                w->get_application()->quit();
-             } else {
-                 g_debug(_("Connection failed, attempting reconnect"));
-                 reconnect_timeout = 5;
-diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
-index e26e0c4..ed83b04 100644
---- a/src/pavucontrol.glade
-+++ b/src/pavucontrol.glade
-@@ -425,10 +425,10 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
-                         <child>
--                          <object class="GtkTable" id="encodingSelect">
-+                          <object class="GtkGrid" id="encodingSelect">
-                             <property name="can_focus">False</property>
--                            <property name="n_rows">2</property>
--                            <property name="n_columns">3</property>
-+                            <property name="row_homogeneous">True</property>
-+                            <property name="column_homogeneous">True</property>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatPCM">
-                                 <property name="label" translatable="yes">PCM</property>
-@@ -439,6 +439,10 @@
-                                 <property name="active">True</property>
-                                 <property name="draw_indicator">True</property>
-                               </object>
-+                              <packing>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">0</property>
-+                              </packing>
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatAC3">
-@@ -450,7 +454,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -462,8 +466,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-+                                <property name="left_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -475,8 +479,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">1</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -489,9 +493,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -504,9 +506,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                           </object>
-diff --git a/src/sinkwidget.h b/src/sinkwidget.h
-index 0044ffc..924fca0 100644
---- a/src/sinkwidget.h
-+++ b/src/sinkwidget.h
-@@ -46,7 +46,7 @@ public:
- 
- #if HAVE_EXT_DEVICE_RESTORE_API
-     encodingList encodings[PAVU_NUM_ENCODINGS];
--    Gtk::Table *encodingSelect;
-+    Gtk::Grid *encodingSelect;
- #endif
- 
-     virtual void onMuteToggleButton();
-diff --git a/src/streamwidget.cc b/src/streamwidget.cc
-index 00df09f..d203b20 100644
---- a/src/streamwidget.cc
-+++ b/src/streamwidget.cc
-@@ -66,7 +66,7 @@ void StreamWidget::init(MainWindow* mainWindow) {
- 
- bool StreamWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
-     return false;
--- 
-GitLab
-
diff --git a/srcpkgs/pavucontrol/template b/srcpkgs/pavucontrol/template
index 1fd6de3d37cc..f8ece7e78984 100644
--- a/srcpkgs/pavucontrol/template
+++ b/srcpkgs/pavucontrol/template
@@ -1,13 +1,14 @@
 # Template file for 'pavucontrol'
 pkgname=pavucontrol
-version=4.0
-revision=2
+version=5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="gtkmm-devel libcanberra-devel gtk+3-devel pulseaudio-devel"
+makedepends="gtkmm-devel libcanberra-devel gtk+3-devel
+ pulseaudio-devel json-glib-devel"
 short_desc="PulseAudio Volume Control"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://freedesktop.org/software/pulseaudio/pavucontrol/"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2
+checksum=ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
@ 2021-08-25  5:13 ` ardadem
  2021-08-25 20:56 ` ardadem
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2021-08-25  5:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-pavucontrol-5
https://github.com/void-linux/void-packages/pull/32510

pavucontrol: update to 5.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

```
Changes:

Support for switching Bluetooth codecs (new in PulseAudio 15.0).
Support for locking card profiles (new in PulseAudio 15.0). Locking a profile prevents PulseAudio from automatically switching away from that profile on plug/unplug events.
New translations: Asturian, Basque, Belarusian, Galician, Hebrew, Kazakh, Norwegian Bokmål, Sinhala, Slovenian
Updated translations: Catalan, Chinese (Simplified), Chinese (Traditional), Croatian, Danish, Dutch, Finnish, French, German, Hungarian, Italian, Japanese, Korean, Lithuanian, Norwegian Nynorsk, Polish, Portugese, Portugese (Brazil), Slovak, Spanish, Swedish, Turkish, Ukrainian.
Some bug fixes.
New dependency: json-glib.
Minimum gtkmm version bumped to 3.22.
```

We should merge it after Pulseaudio 15 since it's required for all new features.

A patch file from https://github.com/void-linux/void-packages/pull/32510.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-pavucontrol-5-32510.patch --]
[-- Type: text/x-diff, Size: 14858 bytes --]

From a82c0b384c8f60c13d978afb039c7426f7c3e591 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 16 Aug 2021 16:15:31 +0300
Subject: [PATCH] pavucontrol: update to 5.0.

---
 .../pavucontrol/patches/fix-segfault.patch    | 319 ------------------
 srcpkgs/pavucontrol/template                  |   9 +-
 2 files changed, 5 insertions(+), 323 deletions(-)
 delete mode 100644 srcpkgs/pavucontrol/patches/fix-segfault.patch

diff --git a/srcpkgs/pavucontrol/patches/fix-segfault.patch b/srcpkgs/pavucontrol/patches/fix-segfault.patch
deleted file mode 100644
index fe7fcba5ccc7..000000000000
--- a/srcpkgs/pavucontrol/patches/fix-segfault.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Upstream: yes, not released.
-
-Remove configure.ac changes to avoid need to reconfigure.
-We know we have the necessary version of its dependencies.
-
-From 284082551938b65e71d06bda793fedbd4a4f41ab Mon Sep 17 00:00:00 2001
-From: Felipe Sateler <fsateler@gmail.com>
-Date: Sat, 28 Dec 2019 12:39:38 -0300
-Subject: [PATCH] Migrate away from deprecated Gtk interfaces
-
-This was accomplished by building with -DGTKMM_DISABLE_DEPRECATED.
----
- configure.ac           |  2 +-
- src/channelwidget.h    |  2 +-
- src/devicewidget.cc    |  6 +++---
- src/mainwindow.cc      | 12 ++++++------
- src/pavuapplication.cc | 22 +++++++++++++++-------
- src/pavuapplication.h  |  2 ++
- src/pavucontrol.cc     |  7 ++++---
- src/pavucontrol.glade  | 24 ++++++++++++------------
- src/sinkwidget.h       |  2 +-
- src/streamwidget.cc    |  2 +-
- 10 files changed, 46 insertions(+), 35 deletions(-)
-
-diff --git a/src/channelwidget.h b/src/channelwidget.h
-index c9c5c9d..6216b74 100644
---- a/src/channelwidget.h
-+++ b/src/channelwidget.h
-@@ -38,7 +38,7 @@ public:
- 
-     Gtk::Label *channelLabel;
-     Gtk::Label *volumeLabel;
--    Gtk::HScale *volumeScale;
-+    Gtk::Scale *volumeScale;
- 
-     int channel;
-     MinimalStreamWidget *minimalStreamWidget;
-diff --git a/src/devicewidget.cc b/src/devicewidget.cc
-index e1b1869..dd41487 100644
---- a/src/devicewidget.cc
-+++ b/src/devicewidget.cc
-@@ -227,7 +227,7 @@ void DeviceWidget::prepareMenu() {
- 
- bool DeviceWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
- 
-@@ -259,8 +259,8 @@ void DeviceWidget::renamePopup() {
-     x->get_widget("renameText", renameText);
- 
-     renameText->set_text(description);
--    dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
--    dialog->add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
-+    dialog->add_button("_Cancel", Gtk::RESPONSE_CANCEL);
-+    dialog->add_button("_OK", Gtk::RESPONSE_OK);
-     dialog->set_default_response(Gtk::RESPONSE_OK);
-     if (Gtk::RESPONSE_OK == dialog->run()) {
-         pa_operation* o;
-diff --git a/src/mainwindow.cc b/src/mainwindow.cc
-index f3d8620..e1a0a82 100644
---- a/src/mainwindow.cc
-+++ b/src/mainwindow.cc
-@@ -95,11 +95,11 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
-     x->get_widget("notebook", notebook);
-     x->get_widget("showVolumeMetersCheckButton", showVolumeMetersCheckButton);
- 
--    cardsVBox->set_reallocate_redraws(true);
--    sourcesVBox->set_reallocate_redraws(true);
--    streamsVBox->set_reallocate_redraws(true);
--    recsVBox->set_reallocate_redraws(true);
--    sinksVBox->set_reallocate_redraws(true);
-+    sourcesVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sourcesVBox->queue_draw(); });
-+    cardsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ cardsVBox->queue_draw(); });
-+    streamsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ streamsVBox->queue_draw(); });
-+    recsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ recsVBox->queue_draw(); });
-+    sinksVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sinksVBox->queue_draw(); });
- 
-     sinkInputTypeComboBox->set_active((int) showSinkInputType);
-     sourceOutputTypeComboBox->set_active((int) showSourceOutputType);
-@@ -222,7 +222,7 @@ bool MainWindow::on_key_press_event(GdkEventKey* event) {
-             case GDK_KEY_Q:
-             case GDK_KEY_w:
-             case GDK_KEY_q:
--                Gtk::Main::quit();
-+                this->get_application()->quit();
-                 return true;
-         }
-     }
-diff --git a/src/pavuapplication.cc b/src/pavuapplication.cc
-index 2ff5739..6773b53 100644
---- a/src/pavuapplication.cc
-+++ b/src/pavuapplication.cc
-@@ -30,6 +30,14 @@
- #include "pavucontrol.h"
- #include "mainwindow.h"
- 
-+static PavuApplication globalInstance;
-+
-+PavuApplication&
-+PavuApplication::get_instance()
-+{
-+    return globalInstance;
-+}
-+
- PavuApplication::PavuApplication() :
-     Gtk::Application("org.pulseaudio.pavucontrol", Gio::ApplicationFlags::APPLICATION_HANDLES_COMMAND_LINE),
-     mainWindow(NULL),
-@@ -143,26 +151,26 @@ int main(int argc, char *argv[]) {
-     signal(SIGPIPE, SIG_IGN);
- 
-     /* Create the application */
--    auto app = PavuApplication();
-+    globalInstance = PavuApplication();
- 
-     /* Add command-line options */
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_INT,
-         "tab", 't',
-         _("Select a specific tab on load."),
-         _("number"));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "retry", 'r',
-         _("Retry forever if pa quits (every 5 seconds)."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "maximize", 'm',
-         _("Maximize the window."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "version", 'v',
-         _("Show version."));
-@@ -170,7 +178,7 @@ int main(int argc, char *argv[]) {
-     /* Connect to the "on_command_line" signal which is fired
-      * when the application receives command-line arguments
-      */
--    app.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &app), false);
-+    globalInstance.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &globalInstance), false);
- 
-     /* Run the application.
-      * In the first launched instance, this will return when its window is
-@@ -179,5 +187,5 @@ int main(int argc, char *argv[]) {
-      * Handling a new request consists of presenting the existing window (and
-      * optionally, select a tab).
-      */
--    return app.run(argc, argv);
-+    return globalInstance.run(argc, argv);
- }
-diff --git a/src/pavuapplication.h b/src/pavuapplication.h
-index 3589c5d..d2a1f5a 100644
---- a/src/pavuapplication.h
-+++ b/src/pavuapplication.h
-@@ -37,6 +37,8 @@ public:
-     gint32 tab;
-     bool version;
- 
-+    static PavuApplication& get_instance();
-+
- protected:
-     // Override default signal handlers:
-     void on_activate() override;
-diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
-index 6981707..bcdde8e 100644
---- a/src/pavucontrol.cc
-+++ b/src/pavucontrol.cc
-@@ -40,6 +40,7 @@
- #include "sourceoutputwidget.h"
- #include "rolewidget.h"
- #include "mainwindow.h"
-+#include "pavuapplication.h"
- 
- static pa_context* context = NULL;
- static pa_mainloop_api* api = NULL;
-@@ -56,7 +57,7 @@ void show_error(const char *txt) {
-     Gtk::MessageDialog dialog(buf, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
-     dialog.run();
- 
--    Gtk::Main::quit();
-+    PavuApplication::get_instance().quit();
- }
- 
- static void dec_outstanding(MainWindow *w) {
-@@ -571,7 +572,7 @@ void context_state_callback(pa_context *c, void *userdata) {
- 
-         case PA_CONTEXT_TERMINATED:
-         default:
--            Gtk::Main::quit();
-+            w->get_application()->quit();
-             return;
-     }
- }
-@@ -613,7 +614,7 @@ gboolean connect_to_pulse(gpointer userdata) {
-         else {
-             if(!retry) {
-                 reconnect_timeout = -1;
--                Gtk::Main::quit();
-+                w->get_application()->quit();
-             } else {
-                 g_debug(_("Connection failed, attempting reconnect"));
-                 reconnect_timeout = 5;
-diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
-index e26e0c4..ed83b04 100644
---- a/src/pavucontrol.glade
-+++ b/src/pavucontrol.glade
-@@ -425,10 +425,10 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
-                         <child>
--                          <object class="GtkTable" id="encodingSelect">
-+                          <object class="GtkGrid" id="encodingSelect">
-                             <property name="can_focus">False</property>
--                            <property name="n_rows">2</property>
--                            <property name="n_columns">3</property>
-+                            <property name="row_homogeneous">True</property>
-+                            <property name="column_homogeneous">True</property>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatPCM">
-                                 <property name="label" translatable="yes">PCM</property>
-@@ -439,6 +439,10 @@
-                                 <property name="active">True</property>
-                                 <property name="draw_indicator">True</property>
-                               </object>
-+                              <packing>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">0</property>
-+                              </packing>
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatAC3">
-@@ -450,7 +454,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -462,8 +466,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-+                                <property name="left_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -475,8 +479,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">1</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -489,9 +493,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -504,9 +506,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                           </object>
-diff --git a/src/sinkwidget.h b/src/sinkwidget.h
-index 0044ffc..924fca0 100644
---- a/src/sinkwidget.h
-+++ b/src/sinkwidget.h
-@@ -46,7 +46,7 @@ public:
- 
- #if HAVE_EXT_DEVICE_RESTORE_API
-     encodingList encodings[PAVU_NUM_ENCODINGS];
--    Gtk::Table *encodingSelect;
-+    Gtk::Grid *encodingSelect;
- #endif
- 
-     virtual void onMuteToggleButton();
-diff --git a/src/streamwidget.cc b/src/streamwidget.cc
-index 00df09f..d203b20 100644
---- a/src/streamwidget.cc
-+++ b/src/streamwidget.cc
-@@ -66,7 +66,7 @@ void StreamWidget::init(MainWindow* mainWindow) {
- 
- bool StreamWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
-     return false;
--- 
-GitLab
-
diff --git a/srcpkgs/pavucontrol/template b/srcpkgs/pavucontrol/template
index 1fd6de3d37cc..f8ece7e78984 100644
--- a/srcpkgs/pavucontrol/template
+++ b/srcpkgs/pavucontrol/template
@@ -1,13 +1,14 @@
 # Template file for 'pavucontrol'
 pkgname=pavucontrol
-version=4.0
-revision=2
+version=5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="gtkmm-devel libcanberra-devel gtk+3-devel pulseaudio-devel"
+makedepends="gtkmm-devel libcanberra-devel gtk+3-devel
+ pulseaudio-devel json-glib-devel"
 short_desc="PulseAudio Volume Control"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://freedesktop.org/software/pulseaudio/pavucontrol/"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2
+checksum=ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
  2021-08-25  5:13 ` [PR PATCH] [Updated] " ardadem
@ 2021-08-25 20:56 ` ardadem
  2021-09-07  9:20 ` ardadem
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2021-08-25 20:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-pavucontrol-5
https://github.com/void-linux/void-packages/pull/32510

pavucontrol: update to 5.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

```
Changes:

Support for switching Bluetooth codecs (new in PulseAudio 15.0).
Support for locking card profiles (new in PulseAudio 15.0). Locking a profile prevents PulseAudio from automatically switching away from that profile on plug/unplug events.
New translations: Asturian, Basque, Belarusian, Galician, Hebrew, Kazakh, Norwegian Bokmål, Sinhala, Slovenian
Updated translations: Catalan, Chinese (Simplified), Chinese (Traditional), Croatian, Danish, Dutch, Finnish, French, German, Hungarian, Italian, Japanese, Korean, Lithuanian, Norwegian Nynorsk, Polish, Portugese, Portugese (Brazil), Slovak, Spanish, Swedish, Turkish, Ukrainian.
Some bug fixes.
New dependency: json-glib.
Minimum gtkmm version bumped to 3.22.
```

We should merge it after Pulseaudio 15 since it's required for all new features.

A patch file from https://github.com/void-linux/void-packages/pull/32510.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-pavucontrol-5-32510.patch --]
[-- Type: text/x-diff, Size: 14858 bytes --]

From d284b4b6a6e5a477a9e23f13463c65d0026069cb Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 16 Aug 2021 16:15:31 +0300
Subject: [PATCH] pavucontrol: update to 5.0.

---
 .../pavucontrol/patches/fix-segfault.patch    | 319 ------------------
 srcpkgs/pavucontrol/template                  |   9 +-
 2 files changed, 5 insertions(+), 323 deletions(-)
 delete mode 100644 srcpkgs/pavucontrol/patches/fix-segfault.patch

diff --git a/srcpkgs/pavucontrol/patches/fix-segfault.patch b/srcpkgs/pavucontrol/patches/fix-segfault.patch
deleted file mode 100644
index fe7fcba5ccc7..000000000000
--- a/srcpkgs/pavucontrol/patches/fix-segfault.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Upstream: yes, not released.
-
-Remove configure.ac changes to avoid need to reconfigure.
-We know we have the necessary version of its dependencies.
-
-From 284082551938b65e71d06bda793fedbd4a4f41ab Mon Sep 17 00:00:00 2001
-From: Felipe Sateler <fsateler@gmail.com>
-Date: Sat, 28 Dec 2019 12:39:38 -0300
-Subject: [PATCH] Migrate away from deprecated Gtk interfaces
-
-This was accomplished by building with -DGTKMM_DISABLE_DEPRECATED.
----
- configure.ac           |  2 +-
- src/channelwidget.h    |  2 +-
- src/devicewidget.cc    |  6 +++---
- src/mainwindow.cc      | 12 ++++++------
- src/pavuapplication.cc | 22 +++++++++++++++-------
- src/pavuapplication.h  |  2 ++
- src/pavucontrol.cc     |  7 ++++---
- src/pavucontrol.glade  | 24 ++++++++++++------------
- src/sinkwidget.h       |  2 +-
- src/streamwidget.cc    |  2 +-
- 10 files changed, 46 insertions(+), 35 deletions(-)
-
-diff --git a/src/channelwidget.h b/src/channelwidget.h
-index c9c5c9d..6216b74 100644
---- a/src/channelwidget.h
-+++ b/src/channelwidget.h
-@@ -38,7 +38,7 @@ public:
- 
-     Gtk::Label *channelLabel;
-     Gtk::Label *volumeLabel;
--    Gtk::HScale *volumeScale;
-+    Gtk::Scale *volumeScale;
- 
-     int channel;
-     MinimalStreamWidget *minimalStreamWidget;
-diff --git a/src/devicewidget.cc b/src/devicewidget.cc
-index e1b1869..dd41487 100644
---- a/src/devicewidget.cc
-+++ b/src/devicewidget.cc
-@@ -227,7 +227,7 @@ void DeviceWidget::prepareMenu() {
- 
- bool DeviceWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
- 
-@@ -259,8 +259,8 @@ void DeviceWidget::renamePopup() {
-     x->get_widget("renameText", renameText);
- 
-     renameText->set_text(description);
--    dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
--    dialog->add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
-+    dialog->add_button("_Cancel", Gtk::RESPONSE_CANCEL);
-+    dialog->add_button("_OK", Gtk::RESPONSE_OK);
-     dialog->set_default_response(Gtk::RESPONSE_OK);
-     if (Gtk::RESPONSE_OK == dialog->run()) {
-         pa_operation* o;
-diff --git a/src/mainwindow.cc b/src/mainwindow.cc
-index f3d8620..e1a0a82 100644
---- a/src/mainwindow.cc
-+++ b/src/mainwindow.cc
-@@ -95,11 +95,11 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
-     x->get_widget("notebook", notebook);
-     x->get_widget("showVolumeMetersCheckButton", showVolumeMetersCheckButton);
- 
--    cardsVBox->set_reallocate_redraws(true);
--    sourcesVBox->set_reallocate_redraws(true);
--    streamsVBox->set_reallocate_redraws(true);
--    recsVBox->set_reallocate_redraws(true);
--    sinksVBox->set_reallocate_redraws(true);
-+    sourcesVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sourcesVBox->queue_draw(); });
-+    cardsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ cardsVBox->queue_draw(); });
-+    streamsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ streamsVBox->queue_draw(); });
-+    recsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ recsVBox->queue_draw(); });
-+    sinksVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sinksVBox->queue_draw(); });
- 
-     sinkInputTypeComboBox->set_active((int) showSinkInputType);
-     sourceOutputTypeComboBox->set_active((int) showSourceOutputType);
-@@ -222,7 +222,7 @@ bool MainWindow::on_key_press_event(GdkEventKey* event) {
-             case GDK_KEY_Q:
-             case GDK_KEY_w:
-             case GDK_KEY_q:
--                Gtk::Main::quit();
-+                this->get_application()->quit();
-                 return true;
-         }
-     }
-diff --git a/src/pavuapplication.cc b/src/pavuapplication.cc
-index 2ff5739..6773b53 100644
---- a/src/pavuapplication.cc
-+++ b/src/pavuapplication.cc
-@@ -30,6 +30,14 @@
- #include "pavucontrol.h"
- #include "mainwindow.h"
- 
-+static PavuApplication globalInstance;
-+
-+PavuApplication&
-+PavuApplication::get_instance()
-+{
-+    return globalInstance;
-+}
-+
- PavuApplication::PavuApplication() :
-     Gtk::Application("org.pulseaudio.pavucontrol", Gio::ApplicationFlags::APPLICATION_HANDLES_COMMAND_LINE),
-     mainWindow(NULL),
-@@ -143,26 +151,26 @@ int main(int argc, char *argv[]) {
-     signal(SIGPIPE, SIG_IGN);
- 
-     /* Create the application */
--    auto app = PavuApplication();
-+    globalInstance = PavuApplication();
- 
-     /* Add command-line options */
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_INT,
-         "tab", 't',
-         _("Select a specific tab on load."),
-         _("number"));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "retry", 'r',
-         _("Retry forever if pa quits (every 5 seconds)."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "maximize", 'm',
-         _("Maximize the window."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "version", 'v',
-         _("Show version."));
-@@ -170,7 +178,7 @@ int main(int argc, char *argv[]) {
-     /* Connect to the "on_command_line" signal which is fired
-      * when the application receives command-line arguments
-      */
--    app.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &app), false);
-+    globalInstance.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &globalInstance), false);
- 
-     /* Run the application.
-      * In the first launched instance, this will return when its window is
-@@ -179,5 +187,5 @@ int main(int argc, char *argv[]) {
-      * Handling a new request consists of presenting the existing window (and
-      * optionally, select a tab).
-      */
--    return app.run(argc, argv);
-+    return globalInstance.run(argc, argv);
- }
-diff --git a/src/pavuapplication.h b/src/pavuapplication.h
-index 3589c5d..d2a1f5a 100644
---- a/src/pavuapplication.h
-+++ b/src/pavuapplication.h
-@@ -37,6 +37,8 @@ public:
-     gint32 tab;
-     bool version;
- 
-+    static PavuApplication& get_instance();
-+
- protected:
-     // Override default signal handlers:
-     void on_activate() override;
-diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
-index 6981707..bcdde8e 100644
---- a/src/pavucontrol.cc
-+++ b/src/pavucontrol.cc
-@@ -40,6 +40,7 @@
- #include "sourceoutputwidget.h"
- #include "rolewidget.h"
- #include "mainwindow.h"
-+#include "pavuapplication.h"
- 
- static pa_context* context = NULL;
- static pa_mainloop_api* api = NULL;
-@@ -56,7 +57,7 @@ void show_error(const char *txt) {
-     Gtk::MessageDialog dialog(buf, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
-     dialog.run();
- 
--    Gtk::Main::quit();
-+    PavuApplication::get_instance().quit();
- }
- 
- static void dec_outstanding(MainWindow *w) {
-@@ -571,7 +572,7 @@ void context_state_callback(pa_context *c, void *userdata) {
- 
-         case PA_CONTEXT_TERMINATED:
-         default:
--            Gtk::Main::quit();
-+            w->get_application()->quit();
-             return;
-     }
- }
-@@ -613,7 +614,7 @@ gboolean connect_to_pulse(gpointer userdata) {
-         else {
-             if(!retry) {
-                 reconnect_timeout = -1;
--                Gtk::Main::quit();
-+                w->get_application()->quit();
-             } else {
-                 g_debug(_("Connection failed, attempting reconnect"));
-                 reconnect_timeout = 5;
-diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
-index e26e0c4..ed83b04 100644
---- a/src/pavucontrol.glade
-+++ b/src/pavucontrol.glade
-@@ -425,10 +425,10 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
-                         <child>
--                          <object class="GtkTable" id="encodingSelect">
-+                          <object class="GtkGrid" id="encodingSelect">
-                             <property name="can_focus">False</property>
--                            <property name="n_rows">2</property>
--                            <property name="n_columns">3</property>
-+                            <property name="row_homogeneous">True</property>
-+                            <property name="column_homogeneous">True</property>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatPCM">
-                                 <property name="label" translatable="yes">PCM</property>
-@@ -439,6 +439,10 @@
-                                 <property name="active">True</property>
-                                 <property name="draw_indicator">True</property>
-                               </object>
-+                              <packing>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">0</property>
-+                              </packing>
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatAC3">
-@@ -450,7 +454,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -462,8 +466,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-+                                <property name="left_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -475,8 +479,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">1</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -489,9 +493,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -504,9 +506,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                           </object>
-diff --git a/src/sinkwidget.h b/src/sinkwidget.h
-index 0044ffc..924fca0 100644
---- a/src/sinkwidget.h
-+++ b/src/sinkwidget.h
-@@ -46,7 +46,7 @@ public:
- 
- #if HAVE_EXT_DEVICE_RESTORE_API
-     encodingList encodings[PAVU_NUM_ENCODINGS];
--    Gtk::Table *encodingSelect;
-+    Gtk::Grid *encodingSelect;
- #endif
- 
-     virtual void onMuteToggleButton();
-diff --git a/src/streamwidget.cc b/src/streamwidget.cc
-index 00df09f..d203b20 100644
---- a/src/streamwidget.cc
-+++ b/src/streamwidget.cc
-@@ -66,7 +66,7 @@ void StreamWidget::init(MainWindow* mainWindow) {
- 
- bool StreamWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
-     return false;
--- 
-GitLab
-
diff --git a/srcpkgs/pavucontrol/template b/srcpkgs/pavucontrol/template
index 1fd6de3d37cc..f8ece7e78984 100644
--- a/srcpkgs/pavucontrol/template
+++ b/srcpkgs/pavucontrol/template
@@ -1,13 +1,14 @@
 # Template file for 'pavucontrol'
 pkgname=pavucontrol
-version=4.0
-revision=2
+version=5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="gtkmm-devel libcanberra-devel gtk+3-devel pulseaudio-devel"
+makedepends="gtkmm-devel libcanberra-devel gtk+3-devel
+ pulseaudio-devel json-glib-devel"
 short_desc="PulseAudio Volume Control"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://freedesktop.org/software/pulseaudio/pavucontrol/"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2
+checksum=ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
  2021-08-25  5:13 ` [PR PATCH] [Updated] " ardadem
  2021-08-25 20:56 ` ardadem
@ 2021-09-07  9:20 ` ardadem
  2021-09-07 19:55 ` paper42
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2021-09-07  9:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/32510#issuecomment-914140405

Comment:
CC @ericonr 

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (2 preceding siblings ...)
  2021-09-07  9:20 ` ardadem
@ 2021-09-07 19:55 ` paper42
  2021-09-07 20:03 ` paper42
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2021-09-07 19:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32510#issuecomment-914582995

Comment:
When this is built with libpulseaudio 15 and runs on a system with libpulseaudio 14, it will fail to start, because of missing symbols? We might want to fix that.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (3 preceding siblings ...)
  2021-09-07 19:55 ` paper42
@ 2021-09-07 20:03 ` paper42
  2021-09-10 17:29 ` [PR PATCH] [Updated] " ardadem
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2021-09-07 20:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 358 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32510#issuecomment-914582995

Comment:
When this is built with libpulseaudio 15 and runs on a system with libpulseaudio 14, it will fail to start, because of missing symbols? We might want to fix that. You could bump libpulseaudio version in common/shlibs.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (4 preceding siblings ...)
  2021-09-07 20:03 ` paper42
@ 2021-09-10 17:29 ` ardadem
  2021-09-10 17:37 ` ardadem
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2021-09-10 17:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-pavucontrol-5
https://github.com/void-linux/void-packages/pull/32510

pavucontrol: update to 5.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

```
Changes:

Support for switching Bluetooth codecs (new in PulseAudio 15.0).
Support for locking card profiles (new in PulseAudio 15.0). Locking a profile prevents PulseAudio from automatically switching away from that profile on plug/unplug events.
New translations: Asturian, Basque, Belarusian, Galician, Hebrew, Kazakh, Norwegian Bokmål, Sinhala, Slovenian
Updated translations: Catalan, Chinese (Simplified), Chinese (Traditional), Croatian, Danish, Dutch, Finnish, French, German, Hungarian, Italian, Japanese, Korean, Lithuanian, Norwegian Nynorsk, Polish, Portugese, Portugese (Brazil), Slovak, Spanish, Swedish, Turkish, Ukrainian.
Some bug fixes.
New dependency: json-glib.
Minimum gtkmm version bumped to 3.22.
```

We should merge it after Pulseaudio 15 since it's required for all new features.

A patch file from https://github.com/void-linux/void-packages/pull/32510.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-pavucontrol-5-32510.patch --]
[-- Type: text/x-diff, Size: 15574 bytes --]

From 7b213cd80d57d4e1fc86aa04a66ba9a4a0030514 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 16 Aug 2021 16:15:31 +0300
Subject: [PATCH] pavucontrol: update to 5.0.

---
 common/shlibs                                 |   6 +-
 .../pavucontrol/patches/fix-segfault.patch    | 319 ------------------
 srcpkgs/pavucontrol/template                  |   9 +-
 3 files changed, 8 insertions(+), 326 deletions(-)
 delete mode 100644 srcpkgs/pavucontrol/patches/fix-segfault.patch

diff --git a/common/shlibs b/common/shlibs
index d3e078140f7b..91b5b14f0425 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -729,9 +729,9 @@ libsndfile.so.1 libsndfile-1.0.20_1
 libspeex.so.1 libspeex-1.1_1
 libspeexdsp.so.1 speexdsp-1.2rc2_1
 libasyncns.so.0 libasyncns-0.8_1
-libpulse.so.0 libpulseaudio-14.2_2
-libpulse-mainloop-glib.so.0 libpulseaudio-14.2_2
-libpulse-simple.so.0 libpulseaudio-14.2_2
+libpulse.so.0 libpulseaudio-15.0_1
+libpulse-mainloop-glib.so.0 libpulseaudio-15.0_1
+libpulse-simple.so.0 libpulseaudio-15.0_1
 libpulsecommon-15.0.so libpulseaudio-15.0_1
 libpulsecore-15.0.so libpulseaudio-15.0_1
 libprojectM.so.3 projectM-3.1.7_2
diff --git a/srcpkgs/pavucontrol/patches/fix-segfault.patch b/srcpkgs/pavucontrol/patches/fix-segfault.patch
deleted file mode 100644
index fe7fcba5ccc7..000000000000
--- a/srcpkgs/pavucontrol/patches/fix-segfault.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Upstream: yes, not released.
-
-Remove configure.ac changes to avoid need to reconfigure.
-We know we have the necessary version of its dependencies.
-
-From 284082551938b65e71d06bda793fedbd4a4f41ab Mon Sep 17 00:00:00 2001
-From: Felipe Sateler <fsateler@gmail.com>
-Date: Sat, 28 Dec 2019 12:39:38 -0300
-Subject: [PATCH] Migrate away from deprecated Gtk interfaces
-
-This was accomplished by building with -DGTKMM_DISABLE_DEPRECATED.
----
- configure.ac           |  2 +-
- src/channelwidget.h    |  2 +-
- src/devicewidget.cc    |  6 +++---
- src/mainwindow.cc      | 12 ++++++------
- src/pavuapplication.cc | 22 +++++++++++++++-------
- src/pavuapplication.h  |  2 ++
- src/pavucontrol.cc     |  7 ++++---
- src/pavucontrol.glade  | 24 ++++++++++++------------
- src/sinkwidget.h       |  2 +-
- src/streamwidget.cc    |  2 +-
- 10 files changed, 46 insertions(+), 35 deletions(-)
-
-diff --git a/src/channelwidget.h b/src/channelwidget.h
-index c9c5c9d..6216b74 100644
---- a/src/channelwidget.h
-+++ b/src/channelwidget.h
-@@ -38,7 +38,7 @@ public:
- 
-     Gtk::Label *channelLabel;
-     Gtk::Label *volumeLabel;
--    Gtk::HScale *volumeScale;
-+    Gtk::Scale *volumeScale;
- 
-     int channel;
-     MinimalStreamWidget *minimalStreamWidget;
-diff --git a/src/devicewidget.cc b/src/devicewidget.cc
-index e1b1869..dd41487 100644
---- a/src/devicewidget.cc
-+++ b/src/devicewidget.cc
-@@ -227,7 +227,7 @@ void DeviceWidget::prepareMenu() {
- 
- bool DeviceWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
- 
-@@ -259,8 +259,8 @@ void DeviceWidget::renamePopup() {
-     x->get_widget("renameText", renameText);
- 
-     renameText->set_text(description);
--    dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
--    dialog->add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
-+    dialog->add_button("_Cancel", Gtk::RESPONSE_CANCEL);
-+    dialog->add_button("_OK", Gtk::RESPONSE_OK);
-     dialog->set_default_response(Gtk::RESPONSE_OK);
-     if (Gtk::RESPONSE_OK == dialog->run()) {
-         pa_operation* o;
-diff --git a/src/mainwindow.cc b/src/mainwindow.cc
-index f3d8620..e1a0a82 100644
---- a/src/mainwindow.cc
-+++ b/src/mainwindow.cc
-@@ -95,11 +95,11 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
-     x->get_widget("notebook", notebook);
-     x->get_widget("showVolumeMetersCheckButton", showVolumeMetersCheckButton);
- 
--    cardsVBox->set_reallocate_redraws(true);
--    sourcesVBox->set_reallocate_redraws(true);
--    streamsVBox->set_reallocate_redraws(true);
--    recsVBox->set_reallocate_redraws(true);
--    sinksVBox->set_reallocate_redraws(true);
-+    sourcesVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sourcesVBox->queue_draw(); });
-+    cardsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ cardsVBox->queue_draw(); });
-+    streamsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ streamsVBox->queue_draw(); });
-+    recsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ recsVBox->queue_draw(); });
-+    sinksVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sinksVBox->queue_draw(); });
- 
-     sinkInputTypeComboBox->set_active((int) showSinkInputType);
-     sourceOutputTypeComboBox->set_active((int) showSourceOutputType);
-@@ -222,7 +222,7 @@ bool MainWindow::on_key_press_event(GdkEventKey* event) {
-             case GDK_KEY_Q:
-             case GDK_KEY_w:
-             case GDK_KEY_q:
--                Gtk::Main::quit();
-+                this->get_application()->quit();
-                 return true;
-         }
-     }
-diff --git a/src/pavuapplication.cc b/src/pavuapplication.cc
-index 2ff5739..6773b53 100644
---- a/src/pavuapplication.cc
-+++ b/src/pavuapplication.cc
-@@ -30,6 +30,14 @@
- #include "pavucontrol.h"
- #include "mainwindow.h"
- 
-+static PavuApplication globalInstance;
-+
-+PavuApplication&
-+PavuApplication::get_instance()
-+{
-+    return globalInstance;
-+}
-+
- PavuApplication::PavuApplication() :
-     Gtk::Application("org.pulseaudio.pavucontrol", Gio::ApplicationFlags::APPLICATION_HANDLES_COMMAND_LINE),
-     mainWindow(NULL),
-@@ -143,26 +151,26 @@ int main(int argc, char *argv[]) {
-     signal(SIGPIPE, SIG_IGN);
- 
-     /* Create the application */
--    auto app = PavuApplication();
-+    globalInstance = PavuApplication();
- 
-     /* Add command-line options */
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_INT,
-         "tab", 't',
-         _("Select a specific tab on load."),
-         _("number"));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "retry", 'r',
-         _("Retry forever if pa quits (every 5 seconds)."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "maximize", 'm',
-         _("Maximize the window."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "version", 'v',
-         _("Show version."));
-@@ -170,7 +178,7 @@ int main(int argc, char *argv[]) {
-     /* Connect to the "on_command_line" signal which is fired
-      * when the application receives command-line arguments
-      */
--    app.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &app), false);
-+    globalInstance.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &globalInstance), false);
- 
-     /* Run the application.
-      * In the first launched instance, this will return when its window is
-@@ -179,5 +187,5 @@ int main(int argc, char *argv[]) {
-      * Handling a new request consists of presenting the existing window (and
-      * optionally, select a tab).
-      */
--    return app.run(argc, argv);
-+    return globalInstance.run(argc, argv);
- }
-diff --git a/src/pavuapplication.h b/src/pavuapplication.h
-index 3589c5d..d2a1f5a 100644
---- a/src/pavuapplication.h
-+++ b/src/pavuapplication.h
-@@ -37,6 +37,8 @@ public:
-     gint32 tab;
-     bool version;
- 
-+    static PavuApplication& get_instance();
-+
- protected:
-     // Override default signal handlers:
-     void on_activate() override;
-diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
-index 6981707..bcdde8e 100644
---- a/src/pavucontrol.cc
-+++ b/src/pavucontrol.cc
-@@ -40,6 +40,7 @@
- #include "sourceoutputwidget.h"
- #include "rolewidget.h"
- #include "mainwindow.h"
-+#include "pavuapplication.h"
- 
- static pa_context* context = NULL;
- static pa_mainloop_api* api = NULL;
-@@ -56,7 +57,7 @@ void show_error(const char *txt) {
-     Gtk::MessageDialog dialog(buf, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
-     dialog.run();
- 
--    Gtk::Main::quit();
-+    PavuApplication::get_instance().quit();
- }
- 
- static void dec_outstanding(MainWindow *w) {
-@@ -571,7 +572,7 @@ void context_state_callback(pa_context *c, void *userdata) {
- 
-         case PA_CONTEXT_TERMINATED:
-         default:
--            Gtk::Main::quit();
-+            w->get_application()->quit();
-             return;
-     }
- }
-@@ -613,7 +614,7 @@ gboolean connect_to_pulse(gpointer userdata) {
-         else {
-             if(!retry) {
-                 reconnect_timeout = -1;
--                Gtk::Main::quit();
-+                w->get_application()->quit();
-             } else {
-                 g_debug(_("Connection failed, attempting reconnect"));
-                 reconnect_timeout = 5;
-diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
-index e26e0c4..ed83b04 100644
---- a/src/pavucontrol.glade
-+++ b/src/pavucontrol.glade
-@@ -425,10 +425,10 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
-                         <child>
--                          <object class="GtkTable" id="encodingSelect">
-+                          <object class="GtkGrid" id="encodingSelect">
-                             <property name="can_focus">False</property>
--                            <property name="n_rows">2</property>
--                            <property name="n_columns">3</property>
-+                            <property name="row_homogeneous">True</property>
-+                            <property name="column_homogeneous">True</property>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatPCM">
-                                 <property name="label" translatable="yes">PCM</property>
-@@ -439,6 +439,10 @@
-                                 <property name="active">True</property>
-                                 <property name="draw_indicator">True</property>
-                               </object>
-+                              <packing>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">0</property>
-+                              </packing>
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatAC3">
-@@ -450,7 +454,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -462,8 +466,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-+                                <property name="left_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -475,8 +479,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">1</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -489,9 +493,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -504,9 +506,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                           </object>
-diff --git a/src/sinkwidget.h b/src/sinkwidget.h
-index 0044ffc..924fca0 100644
---- a/src/sinkwidget.h
-+++ b/src/sinkwidget.h
-@@ -46,7 +46,7 @@ public:
- 
- #if HAVE_EXT_DEVICE_RESTORE_API
-     encodingList encodings[PAVU_NUM_ENCODINGS];
--    Gtk::Table *encodingSelect;
-+    Gtk::Grid *encodingSelect;
- #endif
- 
-     virtual void onMuteToggleButton();
-diff --git a/src/streamwidget.cc b/src/streamwidget.cc
-index 00df09f..d203b20 100644
---- a/src/streamwidget.cc
-+++ b/src/streamwidget.cc
-@@ -66,7 +66,7 @@ void StreamWidget::init(MainWindow* mainWindow) {
- 
- bool StreamWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
-     return false;
--- 
-GitLab
-
diff --git a/srcpkgs/pavucontrol/template b/srcpkgs/pavucontrol/template
index 1fd6de3d37cc..f8ece7e78984 100644
--- a/srcpkgs/pavucontrol/template
+++ b/srcpkgs/pavucontrol/template
@@ -1,13 +1,14 @@
 # Template file for 'pavucontrol'
 pkgname=pavucontrol
-version=4.0
-revision=2
+version=5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="gtkmm-devel libcanberra-devel gtk+3-devel pulseaudio-devel"
+makedepends="gtkmm-devel libcanberra-devel gtk+3-devel
+ pulseaudio-devel json-glib-devel"
 short_desc="PulseAudio Volume Control"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://freedesktop.org/software/pulseaudio/pavucontrol/"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2
+checksum=ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (5 preceding siblings ...)
  2021-09-10 17:29 ` [PR PATCH] [Updated] " ardadem
@ 2021-09-10 17:37 ` ardadem
  2021-09-10 21:18 ` paper42
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2021-09-10 17:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 172 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/32510#issuecomment-917087140

Comment:
@paper42 Do you mean like this?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (6 preceding siblings ...)
  2021-09-10 17:37 ` ardadem
@ 2021-09-10 21:18 ` paper42
  2021-09-11  6:03 ` ardadem
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2021-09-10 21:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 258 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32510#issuecomment-917218329

Comment:
> Do you mean like this?

This seems fine, could you split it to a separate commit, it touches a different package.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (7 preceding siblings ...)
  2021-09-10 21:18 ` paper42
@ 2021-09-11  6:03 ` ardadem
  2021-09-11  8:49 ` paper42
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2021-09-11  6:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/32510#issuecomment-917348723

Comment:
@paper42 I've checked shlibs history. Isn't it's always in the same commit or am i missing something?

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (8 preceding siblings ...)
  2021-09-11  6:03 ` ardadem
@ 2021-09-11  8:49 ` paper42
  2021-09-27  3:33 ` [PR PATCH] [Updated] " ericonr
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2021-09-11  8:49 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32510#issuecomment-917369925

Comment:
> I've checked shlibs history. Isn't it's always in the same commit or am i missing something?

They are in the same commit that touches the package which contains the library. We are updating pavucontrol here and noticed that the pulseaudio update forgot to bump the version in shlibs, so I would say that's a separate problem and should be in a separate commit. Of course this is subjective.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Updated] pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (9 preceding siblings ...)
  2021-09-11  8:49 ` paper42
@ 2021-09-27  3:33 ` ericonr
  2021-09-27  3:33 ` [PR PATCH] [Merged]: " ericonr
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-09-27  3:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2427 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ardadem/void-packages pr-pavucontrol-5
https://github.com/void-linux/void-packages/pull/32510

pavucontrol: update to 5.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

```
Changes:

Support for switching Bluetooth codecs (new in PulseAudio 15.0).
Support for locking card profiles (new in PulseAudio 15.0). Locking a profile prevents PulseAudio from automatically switching away from that profile on plug/unplug events.
New translations: Asturian, Basque, Belarusian, Galician, Hebrew, Kazakh, Norwegian Bokmål, Sinhala, Slovenian
Updated translations: Catalan, Chinese (Simplified), Chinese (Traditional), Croatian, Danish, Dutch, Finnish, French, German, Hungarian, Italian, Japanese, Korean, Lithuanian, Norwegian Nynorsk, Polish, Portugese, Portugese (Brazil), Slovak, Spanish, Swedish, Turkish, Ukrainian.
Some bug fixes.
New dependency: json-glib.
Minimum gtkmm version bumped to 3.22.
```

We should merge it after Pulseaudio 15 since it's required for all new features.

A patch file from https://github.com/void-linux/void-packages/pull/32510.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-pavucontrol-5-32510.patch --]
[-- Type: text/x-diff, Size: 15927 bytes --]

From 9c930c1b5c955ef94c40f6e2e018c3e463f6d7fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Mon, 27 Sep 2021 00:30:06 -0300
Subject: [PATCH 1/2] pulseaudio: update common/shlibs version

PulseAudio 15 introduced new functionality that packages like
pavucontrol will depend on.
---
 common/shlibs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index d3e078140f7b..91b5b14f0425 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -729,9 +729,9 @@ libsndfile.so.1 libsndfile-1.0.20_1
 libspeex.so.1 libspeex-1.1_1
 libspeexdsp.so.1 speexdsp-1.2rc2_1
 libasyncns.so.0 libasyncns-0.8_1
-libpulse.so.0 libpulseaudio-14.2_2
-libpulse-mainloop-glib.so.0 libpulseaudio-14.2_2
-libpulse-simple.so.0 libpulseaudio-14.2_2
+libpulse.so.0 libpulseaudio-15.0_1
+libpulse-mainloop-glib.so.0 libpulseaudio-15.0_1
+libpulse-simple.so.0 libpulseaudio-15.0_1
 libpulsecommon-15.0.so libpulseaudio-15.0_1
 libpulsecore-15.0.so libpulseaudio-15.0_1
 libprojectM.so.3 projectM-3.1.7_2

From b3994d92b3cc9d69a2037eab5e53a002f84b4c6e Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Mon, 16 Aug 2021 16:15:31 +0300
Subject: [PATCH 2/2] pavucontrol: update to 5.0.

---
 .../pavucontrol/patches/fix-segfault.patch    | 319 ------------------
 srcpkgs/pavucontrol/template                  |   9 +-
 2 files changed, 5 insertions(+), 323 deletions(-)
 delete mode 100644 srcpkgs/pavucontrol/patches/fix-segfault.patch

diff --git a/srcpkgs/pavucontrol/patches/fix-segfault.patch b/srcpkgs/pavucontrol/patches/fix-segfault.patch
deleted file mode 100644
index fe7fcba5ccc7..000000000000
--- a/srcpkgs/pavucontrol/patches/fix-segfault.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Upstream: yes, not released.
-
-Remove configure.ac changes to avoid need to reconfigure.
-We know we have the necessary version of its dependencies.
-
-From 284082551938b65e71d06bda793fedbd4a4f41ab Mon Sep 17 00:00:00 2001
-From: Felipe Sateler <fsateler@gmail.com>
-Date: Sat, 28 Dec 2019 12:39:38 -0300
-Subject: [PATCH] Migrate away from deprecated Gtk interfaces
-
-This was accomplished by building with -DGTKMM_DISABLE_DEPRECATED.
----
- configure.ac           |  2 +-
- src/channelwidget.h    |  2 +-
- src/devicewidget.cc    |  6 +++---
- src/mainwindow.cc      | 12 ++++++------
- src/pavuapplication.cc | 22 +++++++++++++++-------
- src/pavuapplication.h  |  2 ++
- src/pavucontrol.cc     |  7 ++++---
- src/pavucontrol.glade  | 24 ++++++++++++------------
- src/sinkwidget.h       |  2 +-
- src/streamwidget.cc    |  2 +-
- 10 files changed, 46 insertions(+), 35 deletions(-)
-
-diff --git a/src/channelwidget.h b/src/channelwidget.h
-index c9c5c9d..6216b74 100644
---- a/src/channelwidget.h
-+++ b/src/channelwidget.h
-@@ -38,7 +38,7 @@ public:
- 
-     Gtk::Label *channelLabel;
-     Gtk::Label *volumeLabel;
--    Gtk::HScale *volumeScale;
-+    Gtk::Scale *volumeScale;
- 
-     int channel;
-     MinimalStreamWidget *minimalStreamWidget;
-diff --git a/src/devicewidget.cc b/src/devicewidget.cc
-index e1b1869..dd41487 100644
---- a/src/devicewidget.cc
-+++ b/src/devicewidget.cc
-@@ -227,7 +227,7 @@ void DeviceWidget::prepareMenu() {
- 
- bool DeviceWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
- 
-@@ -259,8 +259,8 @@ void DeviceWidget::renamePopup() {
-     x->get_widget("renameText", renameText);
- 
-     renameText->set_text(description);
--    dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
--    dialog->add_button(Gtk::Stock::OK, Gtk::RESPONSE_OK);
-+    dialog->add_button("_Cancel", Gtk::RESPONSE_CANCEL);
-+    dialog->add_button("_OK", Gtk::RESPONSE_OK);
-     dialog->set_default_response(Gtk::RESPONSE_OK);
-     if (Gtk::RESPONSE_OK == dialog->run()) {
-         pa_operation* o;
-diff --git a/src/mainwindow.cc b/src/mainwindow.cc
-index f3d8620..e1a0a82 100644
---- a/src/mainwindow.cc
-+++ b/src/mainwindow.cc
-@@ -95,11 +95,11 @@ MainWindow::MainWindow(BaseObjectType* cobject, const Glib::RefPtr<Gtk::Builder>
-     x->get_widget("notebook", notebook);
-     x->get_widget("showVolumeMetersCheckButton", showVolumeMetersCheckButton);
- 
--    cardsVBox->set_reallocate_redraws(true);
--    sourcesVBox->set_reallocate_redraws(true);
--    streamsVBox->set_reallocate_redraws(true);
--    recsVBox->set_reallocate_redraws(true);
--    sinksVBox->set_reallocate_redraws(true);
-+    sourcesVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sourcesVBox->queue_draw(); });
-+    cardsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ cardsVBox->queue_draw(); });
-+    streamsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ streamsVBox->queue_draw(); });
-+    recsVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ recsVBox->queue_draw(); });
-+    sinksVBox->signal_size_allocate().connect([this](Gdk::Rectangle _unused){ sinksVBox->queue_draw(); });
- 
-     sinkInputTypeComboBox->set_active((int) showSinkInputType);
-     sourceOutputTypeComboBox->set_active((int) showSourceOutputType);
-@@ -222,7 +222,7 @@ bool MainWindow::on_key_press_event(GdkEventKey* event) {
-             case GDK_KEY_Q:
-             case GDK_KEY_w:
-             case GDK_KEY_q:
--                Gtk::Main::quit();
-+                this->get_application()->quit();
-                 return true;
-         }
-     }
-diff --git a/src/pavuapplication.cc b/src/pavuapplication.cc
-index 2ff5739..6773b53 100644
---- a/src/pavuapplication.cc
-+++ b/src/pavuapplication.cc
-@@ -30,6 +30,14 @@
- #include "pavucontrol.h"
- #include "mainwindow.h"
- 
-+static PavuApplication globalInstance;
-+
-+PavuApplication&
-+PavuApplication::get_instance()
-+{
-+    return globalInstance;
-+}
-+
- PavuApplication::PavuApplication() :
-     Gtk::Application("org.pulseaudio.pavucontrol", Gio::ApplicationFlags::APPLICATION_HANDLES_COMMAND_LINE),
-     mainWindow(NULL),
-@@ -143,26 +151,26 @@ int main(int argc, char *argv[]) {
-     signal(SIGPIPE, SIG_IGN);
- 
-     /* Create the application */
--    auto app = PavuApplication();
-+    globalInstance = PavuApplication();
- 
-     /* Add command-line options */
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_INT,
-         "tab", 't',
-         _("Select a specific tab on load."),
-         _("number"));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "retry", 'r',
-         _("Retry forever if pa quits (every 5 seconds)."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "maximize", 'm',
-         _("Maximize the window."));
- 
--    app.add_main_option_entry(
-+    globalInstance.add_main_option_entry(
-         Gio::Application::OptionType::OPTION_TYPE_BOOL,
-         "version", 'v',
-         _("Show version."));
-@@ -170,7 +178,7 @@ int main(int argc, char *argv[]) {
-     /* Connect to the "on_command_line" signal which is fired
-      * when the application receives command-line arguments
-      */
--    app.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &app), false);
-+    globalInstance.signal_command_line().connect(sigc::bind(sigc::ptr_fun(&on_command_line), &globalInstance), false);
- 
-     /* Run the application.
-      * In the first launched instance, this will return when its window is
-@@ -179,5 +187,5 @@ int main(int argc, char *argv[]) {
-      * Handling a new request consists of presenting the existing window (and
-      * optionally, select a tab).
-      */
--    return app.run(argc, argv);
-+    return globalInstance.run(argc, argv);
- }
-diff --git a/src/pavuapplication.h b/src/pavuapplication.h
-index 3589c5d..d2a1f5a 100644
---- a/src/pavuapplication.h
-+++ b/src/pavuapplication.h
-@@ -37,6 +37,8 @@ public:
-     gint32 tab;
-     bool version;
- 
-+    static PavuApplication& get_instance();
-+
- protected:
-     // Override default signal handlers:
-     void on_activate() override;
-diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc
-index 6981707..bcdde8e 100644
---- a/src/pavucontrol.cc
-+++ b/src/pavucontrol.cc
-@@ -40,6 +40,7 @@
- #include "sourceoutputwidget.h"
- #include "rolewidget.h"
- #include "mainwindow.h"
-+#include "pavuapplication.h"
- 
- static pa_context* context = NULL;
- static pa_mainloop_api* api = NULL;
-@@ -56,7 +57,7 @@ void show_error(const char *txt) {
-     Gtk::MessageDialog dialog(buf, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
-     dialog.run();
- 
--    Gtk::Main::quit();
-+    PavuApplication::get_instance().quit();
- }
- 
- static void dec_outstanding(MainWindow *w) {
-@@ -571,7 +572,7 @@ void context_state_callback(pa_context *c, void *userdata) {
- 
-         case PA_CONTEXT_TERMINATED:
-         default:
--            Gtk::Main::quit();
-+            w->get_application()->quit();
-             return;
-     }
- }
-@@ -613,7 +614,7 @@ gboolean connect_to_pulse(gpointer userdata) {
-         else {
-             if(!retry) {
-                 reconnect_timeout = -1;
--                Gtk::Main::quit();
-+                w->get_application()->quit();
-             } else {
-                 g_debug(_("Connection failed, attempting reconnect"));
-                 reconnect_timeout = 5;
-diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
-index e26e0c4..ed83b04 100644
---- a/src/pavucontrol.glade
-+++ b/src/pavucontrol.glade
-@@ -425,10 +425,10 @@
-                         <property name="visible">True</property>
-                         <property name="can_focus">False</property>
-                         <child>
--                          <object class="GtkTable" id="encodingSelect">
-+                          <object class="GtkGrid" id="encodingSelect">
-                             <property name="can_focus">False</property>
--                            <property name="n_rows">2</property>
--                            <property name="n_columns">3</property>
-+                            <property name="row_homogeneous">True</property>
-+                            <property name="column_homogeneous">True</property>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatPCM">
-                                 <property name="label" translatable="yes">PCM</property>
-@@ -439,6 +439,10 @@
-                                 <property name="active">True</property>
-                                 <property name="draw_indicator">True</property>
-                               </object>
-+                              <packing>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">0</property>
-+                              </packing>
-                             </child>
-                             <child>
-                               <object class="GtkCheckButton" id="encodingFormatAC3">
-@@ -450,7 +454,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -462,8 +466,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-+                                <property name="left_attach">2</property>
-+                                <property name="top_attach">0</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -475,8 +479,8 @@
-                                 <property name="draw_indicator">True</property>
-                               </object>
-                               <packing>
--                                <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-+                                <property name="left_attach">0</property>
-+                                <property name="top_attach">1</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -489,9 +493,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">1</property>
--                                <property name="right_attach">2</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                             <child>
-@@ -504,9 +506,7 @@
-                               </object>
-                               <packing>
-                                 <property name="left_attach">2</property>
--                                <property name="right_attach">3</property>
-                                 <property name="top_attach">1</property>
--                                <property name="bottom_attach">2</property>
-                               </packing>
-                             </child>
-                           </object>
-diff --git a/src/sinkwidget.h b/src/sinkwidget.h
-index 0044ffc..924fca0 100644
---- a/src/sinkwidget.h
-+++ b/src/sinkwidget.h
-@@ -46,7 +46,7 @@ public:
- 
- #if HAVE_EXT_DEVICE_RESTORE_API
-     encodingList encodings[PAVU_NUM_ENCODINGS];
--    Gtk::Table *encodingSelect;
-+    Gtk::Grid *encodingSelect;
- #endif
- 
-     virtual void onMuteToggleButton();
-diff --git a/src/streamwidget.cc b/src/streamwidget.cc
-index 00df09f..d203b20 100644
---- a/src/streamwidget.cc
-+++ b/src/streamwidget.cc
-@@ -66,7 +66,7 @@ void StreamWidget::init(MainWindow* mainWindow) {
- 
- bool StreamWidget::onContextTriggerEvent(GdkEventButton* event) {
-     if (GDK_BUTTON_PRESS == event->type && 3 == event->button) {
--        contextMenu.popup(event->button, event->time);
-+        contextMenu.popup_at_pointer((GdkEvent*)event);
-         return true;
-     }
-     return false;
--- 
-GitLab
-
diff --git a/srcpkgs/pavucontrol/template b/srcpkgs/pavucontrol/template
index 1fd6de3d37cc..f8ece7e78984 100644
--- a/srcpkgs/pavucontrol/template
+++ b/srcpkgs/pavucontrol/template
@@ -1,13 +1,14 @@
 # Template file for 'pavucontrol'
 pkgname=pavucontrol
-version=4.0
-revision=2
+version=5.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config intltool"
-makedepends="gtkmm-devel libcanberra-devel gtk+3-devel pulseaudio-devel"
+makedepends="gtkmm-devel libcanberra-devel gtk+3-devel
+ pulseaudio-devel json-glib-devel"
 short_desc="PulseAudio Volume Control"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://freedesktop.org/software/pulseaudio/pavucontrol/"
 distfiles="${homepage}/${pkgname}-${version}.tar.xz"
-checksum=8fc45bac9722aefa6f022999cbb76242d143c31b314e2dbb38f034f4069d14e2
+checksum=ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: [PR PATCH] [Merged]: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (10 preceding siblings ...)
  2021-09-27  3:33 ` [PR PATCH] [Updated] " ericonr
@ 2021-09-27  3:33 ` ericonr
  2021-09-27  3:33 ` ericonr
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-09-27  3:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2262 bytes --]

There's a merged pull request on the void-packages repository

pavucontrol: update to 5.0.
https://github.com/void-linux/void-packages/pull/32510

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->

```
Changes:

Support for switching Bluetooth codecs (new in PulseAudio 15.0).
Support for locking card profiles (new in PulseAudio 15.0). Locking a profile prevents PulseAudio from automatically switching away from that profile on plug/unplug events.
New translations: Asturian, Basque, Belarusian, Galician, Hebrew, Kazakh, Norwegian Bokmål, Sinhala, Slovenian
Updated translations: Catalan, Chinese (Simplified), Chinese (Traditional), Croatian, Danish, Dutch, Finnish, French, German, Hungarian, Italian, Japanese, Korean, Lithuanian, Norwegian Nynorsk, Polish, Portugese, Portugese (Brazil), Slovak, Spanish, Swedish, Turkish, Ukrainian.
Some bug fixes.
New dependency: json-glib.
Minimum gtkmm version bumped to 3.22.
```

We should merge it after Pulseaudio 15 since it's required for all new features.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (11 preceding siblings ...)
  2021-09-27  3:33 ` [PR PATCH] [Merged]: " ericonr
@ 2021-09-27  3:33 ` ericonr
  2021-09-27 22:15 ` paper42
  2021-10-04  6:38 ` ardadem
  14 siblings, 0 replies; 16+ messages in thread
From: ericonr @ 2021-09-27  3:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32510#issuecomment-927500469

Comment:
I implemented the commit split and merged, thanks.

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (12 preceding siblings ...)
  2021-09-27  3:33 ` ericonr
@ 2021-09-27 22:15 ` paper42
  2021-10-04  6:38 ` ardadem
  14 siblings, 0 replies; 16+ messages in thread
From: paper42 @ 2021-09-27 22:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 256 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32510#issuecomment-928353546

Comment:
reverted in 8a9bdd07c2796f04e6df1892d97ed21f7357c86b because this update was segfaulting pulseaudio for some reason

^ permalink raw reply	[flat|nested] 16+ messages in thread

* Re: pavucontrol: update to 5.0.
  2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
                   ` (13 preceding siblings ...)
  2021-09-27 22:15 ` paper42
@ 2021-10-04  6:38 ` ardadem
  14 siblings, 0 replies; 16+ messages in thread
From: ardadem @ 2021-10-04  6:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 290 bytes --]

New comment by ardadem on void-packages repository

https://github.com/void-linux/void-packages/pull/32510#issuecomment-933189349

Comment:
Oh, i'm using it with pipewire and thought it will work with pulseaudio if it's works on pipewire. Sorry about that, but i see u already opened a PR.

^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-10-04  6:38 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-16 13:20 [PR PATCH] pavucontrol: update to 5.0 ardadem
2021-08-25  5:13 ` [PR PATCH] [Updated] " ardadem
2021-08-25 20:56 ` ardadem
2021-09-07  9:20 ` ardadem
2021-09-07 19:55 ` paper42
2021-09-07 20:03 ` paper42
2021-09-10 17:29 ` [PR PATCH] [Updated] " ardadem
2021-09-10 17:37 ` ardadem
2021-09-10 21:18 ` paper42
2021-09-11  6:03 ` ardadem
2021-09-11  8:49 ` paper42
2021-09-27  3:33 ` [PR PATCH] [Updated] " ericonr
2021-09-27  3:33 ` [PR PATCH] [Merged]: " ericonr
2021-09-27  3:33 ` ericonr
2021-09-27 22:15 ` paper42
2021-10-04  6:38 ` ardadem

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).