Compare commits
No commits in common. "rawhide" and "f18" have entirely different histories.
5 changed files with 71 additions and 130 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -1,5 +1,3 @@
|
|||
/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
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (volumeicon-b034dd1fefe38ef41a5e70f212f2aabf68010f93.tar.gz) = b970fcfcd73cefb467b0167eec1d61ace696ae1eeeffb47963c32b6d08fb3646d4d2efbcc8c35bea4d0ad2a0b30f07b67619378ccea8a2010b1cd850f629b13e
|
||||
7fd6dffba823e9c529d151d4789ff992 volumeicon-0.4.6.tar.gz
|
||||
|
|
|
|||
11
volumeicon-0.4.5-default-config.patch
Normal file
11
volumeicon-0.4.5-default-config.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- 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)
|
||||
30
volumeicon-0.4.6-fedora.patch
Normal file
30
volumeicon-0.4.6-fedora.patch
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
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);
|
||||
156
volumeicon.spec
156
volumeicon.spec
|
|
@ -1,32 +1,26 @@
|
|||
# Review at https://bugzilla.redhat.com/show_bug.cgi?id=722914
|
||||
|
||||
%global commit b034dd1fefe38ef41a5e70f212f2aabf68010f93
|
||||
|
||||
Name: volumeicon
|
||||
Version: 0.5.1
|
||||
Release: 21.20230208gitb034dd1%{?dist}
|
||||
Version: 0.4.6
|
||||
Release: 2%{?dist}
|
||||
Summary: Lightweight volume control for the system tray
|
||||
|
||||
# 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
|
||||
License: GPLv3
|
||||
URL: http://www.softwarebakery.com/maato/volumeicon.html
|
||||
Source0: http://www.softwarebakery.com/maato/files/volumeicon/volumeicon-%{version}.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: gtk3-devel
|
||||
BuildRequires: gtk2-devel
|
||||
BuildRequires: keybinder-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
|
||||
|
|
@ -42,126 +36,34 @@ Features:
|
|||
* Hotkey support
|
||||
|
||||
%prep
|
||||
%autosetup -n%{name}-%{commit}
|
||||
%setup -q
|
||||
%patch0 -p1 -b .default
|
||||
%patch1 -p1 -b .default
|
||||
|
||||
|
||||
%build
|
||||
sh -v ./autogen.sh
|
||||
# Use pavucontrol by default in Fedora
|
||||
%configure --enable-notify --with-default-mixerapp=pavucontrol
|
||||
%make_build
|
||||
%configure --enable-notify
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
%make_install INSTALL='install -p'
|
||||
%find_lang %{name}
|
||||
rm -rf %{buildroot}
|
||||
make install DESTDIR=%{buildroot} INSTALL='install -p'
|
||||
|
||||
desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart %{SOURCE1}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%license COPYING
|
||||
%doc AUTHORS ChangeLog README.md
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS ChangeLog COPYING
|
||||
%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
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.6-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue