[arch-commits] Commit in pavucontrol/repos/extra-x86_64 (6 files)
Jan Steffens
heftig at gemini.archlinux.org
Wed Sep 7 17:52:14 UTC 2022
Date: Wednesday, September 7, 2022 @ 17:52:14
Author: heftig
Revision: 455229
archrelease: copy trunk to extra-x86_64
Added:
pavucontrol/repos/extra-x86_64/0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch
(from rev 455228, pavucontrol/trunk/0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch)
pavucontrol/repos/extra-x86_64/0002-fix-focus-trap-in-output-selection-widget.patch
(from rev 455228, pavucontrol/trunk/0002-fix-focus-trap-in-output-selection-widget.patch)
pavucontrol/repos/extra-x86_64/PKGBUILD
(from rev 455228, pavucontrol/trunk/PKGBUILD)
Deleted:
pavucontrol/repos/extra-x86_64/0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch
pavucontrol/repos/extra-x86_64/0002-fix-focus-trap-in-output-selection-widget.patch
pavucontrol/repos/extra-x86_64/PKGBUILD
-----------------------------------------------------------------+
0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch | 128 +++++-----
0002-fix-focus-trap-in-output-selection-widget.patch | 46 +--
PKGBUILD | 101 +++----
3 files changed, 134 insertions(+), 141 deletions(-)
Deleted: 0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch
===================================================================
--- 0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch 2022-09-07 17:51:51 UTC (rev 455228)
+++ 0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch 2022-09-07 17:52:14 UTC (rev 455229)
@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <heftig at archlinux.org>
-Date: Wed, 13 Apr 2022 15:59:56 +0000
-Subject: [PATCH] meson: Define HAVE_PULSE_MESSAGING_API when available
-
-To match the autotools build.
----
- meson.build | 8 ++++++++
- src/meson.build | 12 ++++++++++--
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 15acb6c81119..0d72ca17bd42 100644
---- a/meson.build
-+++ b/meson.build
-@@ -6,13 +6,21 @@ project('pavucontrol', 'cpp',
-
- with_lynx = get_option('lynx')
-
-+cpp = meson.get_compiler('cpp')
-+
- gtkmm_dep = dependency('gtkmm-3.0', version : '>= 3.0', required : true)
- sigcpp_dep = dependency('sigc++-2.0', required : true)
- canberragtk_dep = dependency('libcanberra-gtk3', version : '>= 0.16', required : true)
-
- libpulse_dep = dependency('libpulse', version : '>= 5.0', required : true)
- libpulsemlglib_dep = dependency('libpulse-mainloop-glib', version : '>= 0.9.16', required : true)
-
-+have_pulse_messaging_api = cpp.has_function('pa_context_send_message_to_object',
-+ dependencies: [libpulse_dep],
-+)
-+
-+json_glib_dep = dependency('json-glib-1.0', required : have_pulse_messaging_api)
-+
- lynx = find_program('lynx', required: with_lynx)
- tidy = find_program('tidy', required: false)
-
-diff --git a/src/meson.build b/src/meson.build
-index fa2abf44eb1a..d48047513e38 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -14,12 +14,20 @@ pavucontrol_sources = [
- 'streamwidget.cc',
- ]
-
-+pavucontrol_deps = [gtkmm_dep, sigcpp_dep, canberragtk_dep, libpulse_dep, libpulsemlglib_dep]
-+pavucontrol_defines = ['-DHAVE_CONFIG_H']
-+
-+if have_pulse_messaging_api
-+ pavucontrol_deps += [json_glib_dep]
-+ pavucontrol_defines += ['-DHAVE_PULSE_MESSAGING_API']
-+endif
-+
- executable('pavucontrol',
- pavucontrol_sources,
- install: true,
-- cpp_args: ['-DHAVE_CONFIG_H'],
-+ cpp_args: pavucontrol_defines,
- include_directories : configinc,
-- dependencies : [gtkmm_dep, sigcpp_dep, canberragtk_dep, libpulse_dep, libpulsemlglib_dep],
-+ dependencies : pavucontrol_deps,
- )
-
- install_data('pavucontrol.glade')
Copied: pavucontrol/repos/extra-x86_64/0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch (from rev 455228, pavucontrol/trunk/0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch)
===================================================================
--- 0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch (rev 0)
+++ 0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch 2022-09-07 17:52:14 UTC (rev 455229)
@@ -0,0 +1,64 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig at archlinux.org>
+Date: Wed, 13 Apr 2022 15:59:56 +0000
+Subject: [PATCH] meson: Define HAVE_PULSE_MESSAGING_API when available
+
+To match the autotools build.
+---
+ meson.build | 8 ++++++++
+ src/meson.build | 12 ++++++++++--
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 15acb6c81119..0d72ca17bd42 100644
+--- a/meson.build
++++ b/meson.build
+@@ -6,13 +6,21 @@ project('pavucontrol', 'cpp',
+
+ with_lynx = get_option('lynx')
+
++cpp = meson.get_compiler('cpp')
++
+ gtkmm_dep = dependency('gtkmm-3.0', version : '>= 3.0', required : true)
+ sigcpp_dep = dependency('sigc++-2.0', required : true)
+ canberragtk_dep = dependency('libcanberra-gtk3', version : '>= 0.16', required : true)
+
+ libpulse_dep = dependency('libpulse', version : '>= 5.0', required : true)
+ libpulsemlglib_dep = dependency('libpulse-mainloop-glib', version : '>= 0.9.16', required : true)
+
++have_pulse_messaging_api = cpp.has_function('pa_context_send_message_to_object',
++ dependencies: [libpulse_dep],
++)
++
++json_glib_dep = dependency('json-glib-1.0', required : have_pulse_messaging_api)
++
+ lynx = find_program('lynx', required: with_lynx)
+ tidy = find_program('tidy', required: false)
+
+diff --git a/src/meson.build b/src/meson.build
+index fa2abf44eb1a..d48047513e38 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -14,12 +14,20 @@ pavucontrol_sources = [
+ 'streamwidget.cc',
+ ]
+
++pavucontrol_deps = [gtkmm_dep, sigcpp_dep, canberragtk_dep, libpulse_dep, libpulsemlglib_dep]
++pavucontrol_defines = ['-DHAVE_CONFIG_H']
++
++if have_pulse_messaging_api
++ pavucontrol_deps += [json_glib_dep]
++ pavucontrol_defines += ['-DHAVE_PULSE_MESSAGING_API']
++endif
++
+ executable('pavucontrol',
+ pavucontrol_sources,
+ install: true,
+- cpp_args: ['-DHAVE_CONFIG_H'],
++ cpp_args: pavucontrol_defines,
+ include_directories : configinc,
+- dependencies : [gtkmm_dep, sigcpp_dep, canberragtk_dep, libpulse_dep, libpulsemlglib_dep],
++ dependencies : pavucontrol_deps,
+ )
+
+ install_data('pavucontrol.glade')
Deleted: 0002-fix-focus-trap-in-output-selection-widget.patch
===================================================================
--- 0002-fix-focus-trap-in-output-selection-widget.patch 2022-09-07 17:51:51 UTC (rev 455228)
+++ 0002-fix-focus-trap-in-output-selection-widget.patch 2022-09-07 17:52:14 UTC (rev 455229)
@@ -1,23 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alexander Epaneshnikov <aarnaarn2 at gmail.com>
-Date: Mon, 11 Apr 2022 16:27:26 +0300
-Subject: [PATCH] fix focus trap in output selection widget
-
-this fixes #124
----
- src/pavucontrol.glade | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
-index d081e8a9f002..2c53748507ae 100644
---- a/src/pavucontrol.glade
-+++ b/src/pavucontrol.glade
-@@ -1596,7 +1596,7 @@
- <child>
- <object class="GtkComboBoxText" id="deviceComboBox">
- <property name="visible">True</property>
-- <property name="can_focus">True</property>
-+ <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
Copied: pavucontrol/repos/extra-x86_64/0002-fix-focus-trap-in-output-selection-widget.patch (from rev 455228, pavucontrol/trunk/0002-fix-focus-trap-in-output-selection-widget.patch)
===================================================================
--- 0002-fix-focus-trap-in-output-selection-widget.patch (rev 0)
+++ 0002-fix-focus-trap-in-output-selection-widget.patch 2022-09-07 17:52:14 UTC (rev 455229)
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Alexander Epaneshnikov <aarnaarn2 at gmail.com>
+Date: Mon, 11 Apr 2022 16:27:26 +0300
+Subject: [PATCH] fix focus trap in output selection widget
+
+this fixes #124
+---
+ src/pavucontrol.glade | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pavucontrol.glade b/src/pavucontrol.glade
+index d081e8a9f002..2c53748507ae 100644
+--- a/src/pavucontrol.glade
++++ b/src/pavucontrol.glade
+@@ -1596,7 +1596,7 @@
+ <child>
+ <object class="GtkComboBoxText" id="deviceComboBox">
+ <property name="visible">True</property>
+- <property name="can_focus">True</property>
++ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-07 17:51:51 UTC (rev 455228)
+++ PKGBUILD 2022-09-07 17:52:14 UTC (rev 455229)
@@ -1,54 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-# Contributor: Corrado Primier <bardo at aur.archlinux.org>
-# Contributor: William Rea <sillywilly at gmail.com>
-
-pkgname=pavucontrol
-pkgver=5.0+r35+g964f298
-pkgrel=1
-epoch=1
-pkgdesc="PulseAudio Volume Control"
-url="https://freedesktop.org/software/pulseaudio/pavucontrol/"
-arch=(x86_64)
-license=(GPL)
-depends=(gtkmm3 libsigc++ libcanberra json-glib)
-makedepends=(meson lynx git)
-checkdepends=(tidy)
-optdepends=("pulseaudio: Audio backend")
-options=(debug)
-_commit=964f2987a46aa984d9ba83369b1f27c0bb28e9af # master
-source=("git+https://gitlab.freedesktop.org/pulseaudio/pavucontrol.git#commit=$_commit"
- 0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch
- 0002-fix-focus-trap-in-output-selection-widget.patch)
-sha256sums=('SKIP'
- '915c73ebd14b9ce53600a4c636c23a0d2a329f887360512eacc2f6d621394ae9'
- 'd9ab38eea6838a95e6d337c07292cc74de1f7c875f65f967f5f89a141021fc15')
-
-pkgver() {
- cd pavucontrol
- git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
- cd pavucontrol
-
- # Fix meson build
- git apply -3 ../0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch
-
- # https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/issues/124
- # https://gitlab.freedesktop.org/pulseaudio/pavucontrol/-/merge_requests/73
- git apply -3 ../0002-fix-focus-trap-in-output-selection-widget.patch
-}
-
-build() {
- arch-meson pavucontrol build
- meson compile -C build
-}
-
-check() {
- meson test -C build --print-errorlogs
-}
-
-package() {
- meson install -C build --destdir "$pkgdir"
-}
Copied: pavucontrol/repos/extra-x86_64/PKGBUILD (from rev 455228, pavucontrol/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-09-07 17:52:14 UTC (rev 455229)
@@ -0,0 +1,47 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Corrado Primier <bardo at aur.archlinux.org>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=pavucontrol
+pkgver=5.0+r61+gee77d86
+pkgrel=1
+epoch=1
+pkgdesc="PulseAudio Volume Control"
+url="https://freedesktop.org/software/pulseaudio/pavucontrol/"
+arch=(x86_64)
+license=(GPL)
+depends=(gtkmm3 libsigc++ libcanberra json-glib)
+makedepends=(meson lynx git)
+checkdepends=(tidy)
+optdepends=("pulseaudio: Audio backend")
+options=(debug)
+_commit=ee77d86eed3c35f9f7a1f2e2da385d4b526d77a1 # master
+source=("git+https://gitlab.freedesktop.org/pulseaudio/pavucontrol.git#commit=$_commit"
+ 0001-meson-Define-HAVE_PULSE_MESSAGING_API-when-available.patch
+ 0002-fix-focus-trap-in-output-selection-widget.patch)
+sha256sums=('SKIP'
+ '915c73ebd14b9ce53600a4c636c23a0d2a329f887360512eacc2f6d621394ae9'
+ 'd9ab38eea6838a95e6d337c07292cc74de1f7c875f65f967f5f89a141021fc15')
+
+pkgver() {
+ cd pavucontrol
+ git describe --tags | sed 's/^v//;s/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+ cd pavucontrol
+}
+
+build() {
+ arch-meson pavucontrol build
+ meson compile -C build
+}
+
+check() {
+ meson test -C build --print-errorlogs
+}
+
+package() {
+ meson install -C build --destdir "$pkgdir"
+}
More information about the arch-commits
mailing list