Compare commits

...
Sign in to create a new pull request.

27 commits

Author SHA1 Message Date
Fedora Release Engineering
ce05508280 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:36:46 +00:00
Fedora Release Engineering
0dbd7a291e Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:02:39 +00:00
Fedora Release Engineering
5447708d25 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:12:53 +00:00
Fedora Release Engineering
d20cc559ae Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 14:35:53 +00:00
Miroslav Suchý
242e6db108 convert GPLv3 license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-29 14:45:01 +02:00
Fedora Release Engineering
506b5bafbb Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:59:30 +00:00
Fedora Release Engineering
fc22f52f3a Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 08:10:38 +00:00
Raphael Groner
c48954636f use latest snapshot 2023-08-01 18:02:10 +02:00
Fedora Release Engineering
beeb74c818 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:50:49 +00:00
Fedora Release Engineering
a54fe12b7f Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 06:28:46 +00:00
Fedora Release Engineering
c210c5312a Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 12:05:18 +00:00
Fedora Release Engineering
329a50eba1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 04:09:27 +00:00
Fedora Release Engineering
77eecdf064 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 20:38:42 +00:00
Fedora Release Engineering
3699f2d6ea - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 23:13:28 +00:00
Tom Stellard
df500da331 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 00:46:39 +00:00
Fedora Release Engineering
fb73769352 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 13:51:45 +00:00
Fedora Release Engineering
5a65601e4c - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 03:21:18 +00:00
Fedora Release Engineering
ba83b9206e - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 03:09:06 +00:00
Raphael Groner
26fe691291 drop useless BR because of bundling 2019-04-08 23:56:52 +02:00
Fedora Release Engineering
5fe4540597 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 11:25:31 +00:00
Fedora Release Engineering
344068f5a9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 08:38:12 +00:00
Igor Gnatenko
9ae892deff add BuildRequires: gcc
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:53 +02:00
Raphael Groner
d26773a097 bump to v0.5.1 2018-04-02 22:32:37 +02:00
58f5519494
Remove %clean section
None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-14 07:42:40 +01:00
Fedora Release Engineering
1fb1fd75c6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 20:38:39 +00:00
Fedora Release Engineering
6ec5dd6a6b - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 10:07:21 +00:00
Fedora Release Engineering
3ccdcef885 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 21:24:21 +00:00
5 changed files with 109 additions and 71 deletions

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
/volumeicon-0.4.1.tar.gz
/volumeicon-0.4.5.tar.gz
/volumeicon-0.4.6.tar.gz
/volumeicon-0.5.1.tar.gz
/volumeicon-b034dd1fefe38ef41a5e70f212f2aabf68010f93.tar.gz

View file

@ -1 +1 @@
7fd6dffba823e9c529d151d4789ff992 volumeicon-0.4.6.tar.gz
SHA512 (volumeicon-b034dd1fefe38ef41a5e70f212f2aabf68010f93.tar.gz) = b970fcfcd73cefb467b0167eec1d61ace696ae1eeeffb47963c32b6d08fb3646d4d2efbcc8c35bea4d0ad2a0b30f07b67619378ccea8a2010b1cd850f629b13e

View file

@ -1,11 +0,0 @@
--- volumeicon-0.4.5.orig/src/config.c 2011-11-05 19:00:51.000000000 -0400
+++ volumeicon-0.4.5/src/config.c 2012-01-14 10:44:49.682085469 -0500
@@ -59,7 +59,7 @@
static void config_load_default()
{
if(!m_helper_program)
- config_set_helper("xterm -e 'alsamixer'");
+ config_set_helper("pavucontrol");
if(!m_channel)
config_set_channel(NULL);
if(!m_card)

View file

@ -1,30 +0,0 @@
diff --git a/src/alsa_backend.c b/src/alsa_backend.c
index 4635231..d9d63a5 100644
--- a/src/alsa_backend.c
+++ b/src/alsa_backend.c
@@ -22,10 +22,8 @@
//##############################################################################
#include <alsa/asoundlib.h>
-#include <glib/gstring.h>
-#include <glib/gstdio.h>
-#include <glib/glist.h>
-#include <glib/giochannel.h>
+
+#include <glib.h>
#include "alsa_backend.h"
diff --git a/src/volumeicon.c b/src/volumeicon.c
index 29d787b..5b7f6cd 100644
--- a/src/volumeicon.c
+++ b/src/volumeicon.c
@@ -761,7 +761,7 @@ static void volume_icon_load_icons()
gchar * icon_path = g_strdup_printf(ICONS_DIR"/%s/%d.png",
config_get_theme(), i+1);
if(icons_loaded && (NULL != m_icons[i]))
- gdk_pixbuf_unref(m_icons[i]);
+ g_object_unref(m_icons[i]);
m_icons[i] = gdk_pixbuf_new_from_file(icon_path, NULL);
if(NULL == m_icons[i])
g_message("Failed to load '%s'", icon_path);

View file

@ -1,26 +1,32 @@
# Review at https://bugzilla.redhat.com/show_bug.cgi?id=722914
%global commit b034dd1fefe38ef41a5e70f212f2aabf68010f93
Name: volumeicon
Version: 0.4.6
Release: 9%{?dist}
Version: 0.5.1
Release: 21.20230208gitb034dd1%{?dist}
Summary: Lightweight volume control for the system tray
License: GPLv3
URL: http://www.softwarebakery.com/maato/volumeicon.html
Source0: http://www.softwarebakery.com/maato/files/volumeicon/volumeicon-%{version}.tar.gz
# Automatically converted from old format: GPLv3 - review is highly recommended.
License: GPL-3.0-only
URL: https://github.com/Maato/%{name}
Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{commit}.tar.gz
# Source1 was borrowed from gnome-media package and adjusted for our needs
Source1: %{name}.desktop
# Use pavucontrol by default in Fedora. Not upstreamed.
# Do not hardcode card hw:0. Submitted upstream by mail on 2012-01-14. Accepted.
Patch0: %{name}-0.4.5-default-config.patch
# Fix build error on Fedora. Received by mail from upstream on 2012-01-19.
Patch1: %{name}-0.4.6-fedora.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: keybinder-devel
BuildRequires: gtk3-devel
BuildRequires: libnotify-devel >= 0.5.0
BuildRequires: intltool
BuildRequires: gettext
Requires: pavucontrol
# bundling of some functions partly copied from keybinder, currently retired
Provides: bundled(keybinder) = 0.3.1
%description
Volume Icon aims to be a lightweight volume control that sits in your system
@ -36,34 +42,105 @@ Features:
* Hotkey support
%prep
%setup -q
%patch0 -p1 -b .default
%patch1 -p1 -b .default
%autosetup -n%{name}-%{commit}
%build
%configure --enable-notify
make %{?_smp_mflags}
sh -v ./autogen.sh
# Use pavucontrol by default in Fedora
%configure --enable-notify --with-default-mixerapp=pavucontrol
%make_build
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL='install -p'
%make_install INSTALL='install -p'
%find_lang %{name}
desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart %{SOURCE1}
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING
%files -f %{name}.lang
%license COPYING
%doc AUTHORS ChangeLog README.md
%config(noreplace) %{_sysconfdir}/xdg/autostart/%{name}.desktop
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/man/man1/%{name}.1*
%{_datadir}/man/man5/%{name}.5*
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-21.20230208gitb034dd1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-20.20230208gitb034dd1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-19.20230208gitb034dd1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-18.20230208gitb034dd1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 0.5.1-17.20230208gitb034dd1
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-16.20230208gitb034dd1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-15.20230208gitb034dd1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Aug 01 2023 Raphael Groner <raphgro@fedoraproject.org> - 0.5.1-14.20230208gitb034dd1
- use latest snapshot
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Apr 08 2019 Raphael Groner <projects.rg@smart.ms> - 0.5.1-4
- drop useless BR because of bundling
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Apr 02 2018 Raphael Groner <projects.rg@smart.ms> - 0.5.1-1
- new version
- drop upstreamed patches
- update build dependencies
- add runtime dependency pavucontrol, explicitly
- modernize
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild