[arch-commits] Commit in gnome-alsamixer/repos (8 files)
Evangelos Foutras
foutrelis at archlinux.org
Fri Nov 9 22:21:35 UTC 2018
Date: Friday, November 9, 2018 @ 22:21:34
Author: foutrelis
Revision: 338673
archrelease: copy trunk to staging-x86_64
Added:
gnome-alsamixer/repos/staging-x86_64/
gnome-alsamixer/repos/staging-x86_64/02_change_gconf-keys_path.patch
(from rev 338672, gnome-alsamixer/trunk/02_change_gconf-keys_path.patch)
gnome-alsamixer/repos/staging-x86_64/03_gnome-alsamixer.schemas.patch
(from rev 338672, gnome-alsamixer/trunk/03_gnome-alsamixer.schemas.patch)
gnome-alsamixer/repos/staging-x86_64/04_ignore-delimiters.patch
(from rev 338672, gnome-alsamixer/trunk/04_ignore-delimiters.patch)
gnome-alsamixer/repos/staging-x86_64/05-remove-G_CONST_RETURN.patch
(from rev 338672, gnome-alsamixer/trunk/05-remove-G_CONST_RETURN.patch)
gnome-alsamixer/repos/staging-x86_64/06-drop-libgnomeui.patch
(from rev 338672, gnome-alsamixer/trunk/06-drop-libgnomeui.patch)
gnome-alsamixer/repos/staging-x86_64/PKGBUILD
(from rev 338672, gnome-alsamixer/trunk/PKGBUILD)
gnome-alsamixer/repos/staging-x86_64/gnome-alsamixer.desktop
(from rev 338672, gnome-alsamixer/trunk/gnome-alsamixer.desktop)
----------------------------------+
02_change_gconf-keys_path.patch | 207 +++++++++++++++++++++++++++++++++++++
03_gnome-alsamixer.schemas.patch | 174 +++++++++++++++++++++++++++++++
04_ignore-delimiters.patch | 15 ++
05-remove-G_CONST_RETURN.patch | 111 +++++++++++++++++++
06-drop-libgnomeui.patch | 128 ++++++++++++++++++++++
PKGBUILD | 54 +++++++++
gnome-alsamixer.desktop | 11 +
7 files changed, 700 insertions(+)
Copied: gnome-alsamixer/repos/staging-x86_64/02_change_gconf-keys_path.patch (from rev 338672, gnome-alsamixer/trunk/02_change_gconf-keys_path.patch)
===================================================================
--- staging-x86_64/02_change_gconf-keys_path.patch (rev 0)
+++ staging-x86_64/02_change_gconf-keys_path.patch 2018-11-09 22:21:34 UTC (rev 338673)
@@ -0,0 +1,207 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_change_gconf-keys_path.dpatch.dpatch by Mohammed Adnène Trojette <adn+deb at diwi.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Replace path to gnome-alsamixer's gconf keys
+
+ at DPATCH@
+
+--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-slider.c
++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-slider.c
+@@ -481,7 +481,7 @@
+
+ disp_name = g_strndup (gam_slider_get_name (gam_slider), 8);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_display_names/%s-%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_display_names/%s-%s",
+ gam_mixer_get_config_name (GAM_MIXER (priv->mixer)),
+ gam_slider_get_config_name (gam_slider));
+
+@@ -508,7 +508,7 @@
+
+ priv = GAM_SLIDER_GET_PRIVATE (gam_slider);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_display_names/%s-%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_display_names/%s-%s",
+ gam_mixer_get_config_name (GAM_MIXER (priv->mixer)),
+ gam_slider_get_config_name (gam_slider));
+
+@@ -533,7 +533,7 @@
+
+ priv = GAM_SLIDER_GET_PRIVATE (gam_slider);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_sliders/%s-%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_sliders/%s-%s",
+ gam_mixer_get_config_name (GAM_MIXER (priv->mixer)),
+ gam_slider_get_config_name (gam_slider));
+
+@@ -557,7 +557,7 @@
+
+ priv = GAM_SLIDER_GET_PRIVATE (gam_slider);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_sliders/%s-%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_sliders/%s-%s",
+ gam_mixer_get_config_name (GAM_MIXER (priv->mixer)),
+ gam_slider_get_config_name (gam_slider));
+
+--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-toggle.c
++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-toggle.c
+@@ -410,7 +410,7 @@
+
+ priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/toggle_display_names/%s-%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/toggle_display_names/%s-%s",
+ gam_mixer_get_config_name (GAM_MIXER (priv->mixer)),
+ gam_toggle_get_config_name (gam_toggle));
+
+@@ -433,7 +433,7 @@
+
+ priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/toggle_display_names/%s-%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/toggle_display_names/%s-%s",
+ gam_mixer_get_config_name (GAM_MIXER (priv->mixer)),
+ gam_toggle_get_config_name (gam_toggle));
+
+@@ -458,7 +458,7 @@
+
+ priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_toggles/%s-%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_toggles/%s-%s",
+ gam_mixer_get_config_name (GAM_MIXER (priv->mixer)),
+ gam_toggle_get_config_name (gam_toggle));
+
+@@ -482,7 +482,7 @@
+
+ priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_toggles/%s-%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_toggles/%s-%s",
+ gam_mixer_get_config_name (GAM_MIXER (priv->mixer)),
+ gam_toggle_get_config_name (gam_toggle));
+
+--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-app.c
++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-app.c
+@@ -331,7 +331,7 @@
+ gam_app_load_prefs (gam_app);
+
+ /*gconf_client_notify_add (priv->gconf_client,
+- "/apps/PAW/gnomealsamixer/preferences/tab_position",
++ "/apps/gnomealsamixer/preferences/tab_position",
+ (GConfClientNotifyFunc) pawed_app_gconf_notify_func,
+ pawed_app,
+ NULL,
+@@ -351,10 +351,10 @@
+ priv = GAM_APP_GET_PRIVATE (gam_app);
+
+ width = gconf_client_get_int (priv->gconf_client,
+- "/apps/PAW/gnome-alsamixer/geometry/main_window_width",
++ "/apps/gnome-alsamixer/geometry/main_window_width",
+ NULL);
+ height = gconf_client_get_int (priv->gconf_client,
+- "/apps/PAW/gnome-alsamixer/geometry/main_window_height",
++ "/apps/gnome-alsamixer/geometry/main_window_height",
+ NULL);
+
+ if ((height != 0) && (width != 0))
+@@ -376,11 +376,11 @@
+ gdk_window_get_geometry (GDK_WINDOW (GTK_WIDGET (gam_app)->window), NULL, NULL, &width, &height, NULL);
+
+ gconf_client_set_int (priv->gconf_client,
+- "/apps/PAW/gnome-alsamixer/geometry/main_window_height",
++ "/apps/gnome-alsamixer/geometry/main_window_height",
+ height,
+ NULL);
+ gconf_client_set_int (priv->gconf_client,
+- "/apps/PAW/gnome-alsamixer/geometry/main_window_width",
++ "/apps/gnome-alsamixer/geometry/main_window_width",
+ width,
+ NULL);
+
+@@ -630,7 +630,7 @@
+ gint
+ gam_app_get_mixer_slider_style (GamApp *gam_app)
+ {
+- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_style";
++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_style";
+ gint style = 0;
+
+ g_return_if_fail (GAM_IS_APP (gam_app));
+@@ -646,7 +646,7 @@
+ void
+ gam_app_set_mixer_slider_style (GamApp *gam_app, gint style)
+ {
+- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_style";
++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_style";
+
+ g_return_if_fail (GAM_IS_APP (gam_app));
+
+@@ -661,7 +661,7 @@
+ gint
+ gam_app_get_slider_toggle_style (GamApp *gam_app)
+ {
+- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_toggle_style";
++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style";
+ gint style = 1;
+
+ g_return_if_fail (GAM_IS_APP (gam_app));
+@@ -677,7 +677,7 @@
+ void
+ gam_app_set_slider_toggle_style (GamApp *gam_app, gint style)
+ {
+- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_toggle_style";
++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style";
+
+ g_return_if_fail (GAM_IS_APP (gam_app));
+
+--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-slider-dual.c
++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-slider-dual.c
+@@ -446,7 +446,7 @@
+
+ priv = GAM_SLIDER_DUAL_GET_PRIVATE (gam_slider_dual);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_locked/%s-%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_locked/%s-%s",
+ gam_mixer_get_config_name (gam_slider_get_mixer (GAM_SLIDER (gam_slider_dual))),
+ gam_slider_get_config_name (GAM_SLIDER (gam_slider_dual)));
+
+--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-mixer.c
++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-mixer.c
+@@ -478,7 +478,7 @@
+
+ priv = GAM_MIXER_GET_PRIVATE (gam_mixer);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_names/%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_names/%s",
+ gam_mixer_get_config_name (gam_mixer));
+
+ name = gconf_client_get_string (gam_app_get_gconf_client (GAM_APP (priv->app)),
+@@ -500,7 +500,7 @@
+
+ priv = GAM_MIXER_GET_PRIVATE (gam_mixer);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_names/%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_names/%s",
+ gam_mixer_get_config_name (gam_mixer));
+
+ gconf_client_set_string (gam_app_get_gconf_client (GAM_APP (priv->app)),
+@@ -526,7 +526,7 @@
+
+ priv = GAM_MIXER_GET_PRIVATE (gam_mixer);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_mixers/%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_mixers/%s",
+ gam_mixer_get_config_name (gam_mixer));
+
+ if (gconf_client_dir_exists (gam_app_get_gconf_client (GAM_APP (priv->app)), key, NULL))
+@@ -549,7 +549,7 @@
+
+ priv = GAM_MIXER_GET_PRIVATE (gam_mixer);
+
+- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_mixers/%s",
++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_mixers/%s",
+ gam_mixer_get_config_name (gam_mixer));
+
+ gconf_client_set_bool (gam_app_get_gconf_client (GAM_APP (priv->app)),
Copied: gnome-alsamixer/repos/staging-x86_64/03_gnome-alsamixer.schemas.patch (from rev 338672, gnome-alsamixer/trunk/03_gnome-alsamixer.schemas.patch)
===================================================================
--- staging-x86_64/03_gnome-alsamixer.schemas.patch (rev 0)
+++ staging-x86_64/03_gnome-alsamixer.schemas.patch 2018-11-09 22:21:34 UTC (rev 338673)
@@ -0,0 +1,174 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_gnome-alsamixer.schemas.dpatch.dpatch by Mohammed Adnène Trojette <adn+deb at diwi.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Intent to guess gnome-alsamixer.schemas
+
+ at DPATCH@
+
+--- gnome-alsamixer-0.9.7.cvs20050822.orig/gnome-alsamixer.schemas
++++ gnome-alsamixer-0.9.7.cvs20050822/gnome-alsamixer.schemas
+@@ -0,0 +1,163 @@
++<gconfschemafile>
++ <schemalist>
++
++ <!-- Completion uris -->
++
++ <!--schema>
++ <key>/schemas/apps/PAW/PAWed/preferences</key>
++ <applyto>/apps/PAW/PAWed/preferences</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type></type>
++ <default></default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <schema>
++ <key>/schemas/apps/gnomealsamixer/preferences/tab_position</key>
++ <applyto>/apps/gnomealsamixer/preferences/tab_position</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>int</type>
++ <default></default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema-->
++
++
++ <schema>
++ <key>/schemas/apps/gnome-alsamixer/geometry/main_window_width</key>
++ <applyto>/apps/gnome-alsamixer/geometry/main_window_width</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>int</type>
++ <default>600</default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <schema>
++ <key>/schemas/apps/gnome-alsamixer/geometry/main_window_height</key>
++ <applyto>/apps/gnome-alsamixer/geometry/main_window_height</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>int</type>
++ <default>380</default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <schema>
++ <key>/schemas/apps/gnome-alsamixer/geometry/mixer_slider_style</key>
++ <applyto>/apps/gnome-alsamixer/geometry/mixer_slider_style</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>bool</type>
++ <default>false</default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <schema>
++ <key>/schemas/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style</key>
++ <applyto>/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>bool</type>
++ <default>true</default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <!--schema>
++ <key>/schemas/apps/gnome-alsamixer/display_names/%s</key>
++ <applyto>/apps/gnome-alsamixer/display_names/%s</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>bool</type>
++ <default></default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <schema>
++ <key>/schemas/apps/gnome-alsamixer/display_mixers/%s</key>
++ <applyto>/apps/gnome-alsamixer/display_mixers/%s</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>bool</type>
++ <default></default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <schema>
++ <key>/schemas/apps/gnome-alsamixer/slider_display_names/%s-%s</key>
++ <applyto>/apps/gnome-alsamixer/slider_display_names/%s-%s</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>string</type>
++ <default></default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <schema>
++ <key>/schemas/apps/gnome-alsamixer/display_sliders/%s-%s</key>
++ <applyto>/apps/gnome-alsamixer/display_sliders/%s-%s</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>bool</type>
++ <default></default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <schema>
++ <key>/schemas/apps/gnome-alsamixer/slider_locked/%s-%s</key>
++ <applyto>/apps/gnome-alsamixer/slider_locked/%s-%s</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>bool</type>
++ <default></default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <schema>
++ <key>/schemas/apps/gnome-alsamixer/toggle_display_names/%s-%s</key>
++ <applyto>/apps/gnome-alsamixer/toggle_display_names/%s-%s</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>string</type>
++ <default></default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema>
++
++
++ <schema>
++ <key>/schemas/apps/gnome-alsamixer/display_toggles/%s-%s</key>
++ <applyto>/apps/gnome-alsamixer/display_toggles/%s-%s</applyto>
++ <owner>gnome-alsamixer</owner>
++ <type>bool</type>
++ <default></default>
++ <locale name="C">
++ <short></short>
++ </locale>
++ </schema-->
++
++
++ </schemalist>
++</gconfschemafile>
Copied: gnome-alsamixer/repos/staging-x86_64/04_ignore-delimiters.patch (from rev 338672, gnome-alsamixer/trunk/04_ignore-delimiters.patch)
===================================================================
--- staging-x86_64/04_ignore-delimiters.patch (rev 0)
+++ staging-x86_64/04_ignore-delimiters.patch 2018-11-09 22:21:34 UTC (rev 338673)
@@ -0,0 +1,15 @@
+# Fixes: #400667
+
+Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.h
+===================================================================
+--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.h 2008-01-04 00:43:39.000000000 +0100
++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.h 2008-01-04 00:44:18.000000000 +0100
+@@ -26,7 +26,7 @@
+
+ G_BEGIN_DECLS
+
+-#define GAM_CONFIG_DELIMITERS " &()+/"
++#define GAM_CONFIG_DELIMITERS " &()+/,"
+
+ #define GAM_TYPE_APP (gam_app_get_type ())
+ #define GAM_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAM_TYPE_APP, GamApp))
Copied: gnome-alsamixer/repos/staging-x86_64/05-remove-G_CONST_RETURN.patch (from rev 338672, gnome-alsamixer/trunk/05-remove-G_CONST_RETURN.patch)
===================================================================
--- staging-x86_64/05-remove-G_CONST_RETURN.patch (rev 0)
+++ staging-x86_64/05-remove-G_CONST_RETURN.patch 2018-11-09 22:21:34 UTC (rev 338673)
@@ -0,0 +1,111 @@
+Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c
+===================================================================
+--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.c 2011-09-12 21:01:20.000000000 +0200
++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c 2011-09-12 21:02:41.000000000 +0200
+@@ -439,7 +439,7 @@
+ NULL);
+ }
+
+-G_CONST_RETURN gchar *
++const gchar *
+ gam_mixer_get_mixer_name (GamMixer *gam_mixer)
+ {
+ GamMixerPrivate *priv;
+@@ -451,7 +451,7 @@
+ return priv->mixer_name;
+ }
+
+-G_CONST_RETURN gchar *
++const gchar *
+ gam_mixer_get_config_name (GamMixer *gam_mixer)
+ {
+ GamMixerPrivate *priv;
+Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h
+===================================================================
+--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.h 2011-09-12 21:01:43.000000000 +0200
++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h 2011-09-12 21:03:36.000000000 +0200
+@@ -57,8 +57,8 @@
+ GType gam_mixer_get_type (void) G_GNUC_CONST;
+ GtkWidget *gam_mixer_new (GamApp *gam_app,
+ const gchar *card_id);
+-G_CONST_RETURN gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer);
+-G_CONST_RETURN gchar *gam_mixer_get_config_name (GamMixer *gam_mixer);
++const gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer);
++const gchar *gam_mixer_get_config_name (GamMixer *gam_mixer);
+ gchar *gam_mixer_get_display_name (GamMixer *gam_mixer);
+ void gam_mixer_set_display_name (GamMixer *gam_mixer,
+ const gchar *name);
+Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c
+===================================================================
+--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.c 2011-09-12 21:01:49.000000000 +0200
++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c 2011-09-12 21:03:47.000000000 +0200
+@@ -440,7 +440,7 @@
+ g_signal_emit (gam_slider, signals[REFRESH], 0);
+ }
+
+-G_CONST_RETURN gchar *
++const gchar *
+ gam_slider_get_name (GamSlider *gam_slider)
+ {
+ GamSliderPrivate *priv;
+@@ -452,7 +452,7 @@
+ return snd_mixer_selem_get_name (priv->elem);
+ }
+
+-G_CONST_RETURN gchar *
++const gchar *
+ gam_slider_get_config_name (GamSlider *gam_slider)
+ {
+ GamSliderPrivate *priv;
+Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h
+===================================================================
+--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.h 2011-09-12 21:01:28.000000000 +0200
++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h 2011-09-12 21:03:13.000000000 +0200
+@@ -58,8 +58,8 @@
+ #include "gam-mixer.h"
+
+ GType gam_slider_get_type (void) G_GNUC_CONST;
+-G_CONST_RETURN gchar *gam_slider_get_name (GamSlider *gam_slider);
+-G_CONST_RETURN gchar *gam_slider_get_config_name (GamSlider *gam_slider);
++const gchar *gam_slider_get_name (GamSlider *gam_slider);
++const gchar *gam_slider_get_config_name (GamSlider *gam_slider);
+ gchar *gam_slider_get_display_name (GamSlider *gam_slider);
+ void gam_slider_set_display_name (GamSlider *gam_slider,
+ const gchar *name);
+Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c
+===================================================================
+--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.c 2011-09-12 21:01:36.000000000 +0200
++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c 2011-09-12 21:03:26.000000000 +0200
+@@ -371,7 +371,7 @@
+ internal_state);
+ }
+
+-G_CONST_RETURN gchar *
++const gchar *
+ gam_toggle_get_name (GamToggle *gam_toggle)
+ {
+ GamTogglePrivate *priv;
+@@ -383,7 +383,7 @@
+ return snd_mixer_selem_get_name (priv->elem);
+ }
+
+-G_CONST_RETURN gchar *
++const gchar *
+ gam_toggle_get_config_name (GamToggle *gam_toggle)
+ {
+ GamTogglePrivate *priv;
+Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h
+===================================================================
+--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.h 2011-09-12 21:01:55.000000000 +0200
++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h 2011-09-12 21:04:00.000000000 +0200
+@@ -55,8 +55,8 @@
+ gboolean gam_toggle_get_state (GamToggle *gam_toggle);
+ void gam_toggle_set_state (GamToggle *gam_toggle,
+ gboolean state);
+-G_CONST_RETURN gchar *gam_toggle_get_name (GamToggle *gam_toggle);
+-G_CONST_RETURN gchar *gam_toggle_get_config_name (GamToggle *gam_toggle);
++const gchar *gam_toggle_get_name (GamToggle *gam_toggle);
++const gchar *gam_toggle_get_config_name (GamToggle *gam_toggle);
+ gchar *gam_toggle_get_display_name (GamToggle *gam_toggle);
+ void gam_toggle_set_display_name (GamToggle *gam_toggle,
+ const gchar *name);
Copied: gnome-alsamixer/repos/staging-x86_64/06-drop-libgnomeui.patch (from rev 338672, gnome-alsamixer/trunk/06-drop-libgnomeui.patch)
===================================================================
--- staging-x86_64/06-drop-libgnomeui.patch (rev 0)
+++ staging-x86_64/06-drop-libgnomeui.patch 2018-11-09 22:21:34 UTC (rev 338673)
@@ -0,0 +1,128 @@
+diff -Naur gnome-alsamixer-0.9.7~cvs.20060916.orig/configure.ac gnome-alsamixer-0.9.7~cvs.20060916/configure.ac
+--- gnome-alsamixer-0.9.7~cvs.20060916.orig/configure.ac 2006-08-06 04:29:44.000000000 +0200
++++ gnome-alsamixer-0.9.7~cvs.20060916/configure.ac 2017-01-21 14:08:40.656742382 +0100
+@@ -32,7 +32,7 @@
+ AC_DEFINE_UNQUOTED(HAVE_GTK26, , "")
+ fi
+
+-pkg_modules="libgnomeui-2.0 gconf-2.0 alsa"
++pkg_modules="gtk+-2.0 gconf-2.0 alsa"
+ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+ AC_SUBST(PACKAGE_CFLAGS)
+ AC_SUBST(PACKAGE_LIBS)
+diff -Naur gnome-alsamixer-0.9.7~cvs.20060916.orig/src/gam-app.c gnome-alsamixer-0.9.7~cvs.20060916/src/gam-app.c
+--- gnome-alsamixer-0.9.7~cvs.20060916.orig/src/gam-app.c 2005-07-08 15:59:23.000000000 +0200
++++ gnome-alsamixer-0.9.7~cvs.20060916/src/gam-app.c 2017-01-21 13:59:13.194309849 +0100
+@@ -22,13 +22,8 @@
+ #include <config.h>
+ #endif
+
+-#include <gtk/gtklabel.h>
+-#include <gtk/gtknotebook.h>
+-#include <gtk/gtkmenuitem.h>
++#include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+-#include <libgnomeui/gnome-about.h>
+-#include <libgnomeui/gnome-app-helper.h>
+-#include <libgnomeui/gnome-stock-icons.h>
+
+ #include "gam-app.h"
+ #include "gam-mixer.h"
+@@ -95,7 +90,7 @@
+ { "Exit", GTK_STOCK_OPEN, N_("E_xit"), "<control>Q", N_("Exit the program"), G_CALLBACK (gam_app_quit_cb) },
+ { "Properties", GTK_STOCK_PROPERTIES, N_("Sound Card _Properties"), "", N_("Configure the current sound card"), G_CALLBACK (gam_app_properties_cb) },
+ { "Preferences", GTK_STOCK_PREFERENCES, N_("Program Prefere_nces"), "", N_("Configure the application"), G_CALLBACK (gam_app_preferences_cb) },
+- { "About", GNOME_STOCK_ABOUT, N_("_About"), "", N_("About this application"), G_CALLBACK (gam_app_about_cb) },
++ { "About", GTK_STOCK_ABOUT, N_("_About"), "", N_("About this application"), G_CALLBACK (gam_app_about_cb) },
+ };
+
+ static const gchar *ui_description =
+@@ -261,7 +256,7 @@
+ g_signal_connect (G_OBJECT (gam_app), "delete_event",
+ G_CALLBACK (gam_app_delete), NULL);
+
+- gnome_window_icon_set_default_from_file (PIXMAP_ICONDIR"/gnome-alsamixer-icon.png");
++ gtk_window_set_default_icon (gdk_pixbuf_new_from_file(PIXMAP_ICONDIR"/gnome-alsamixer-icon.png", NULL));
+
+ // Build the main menu and toolbar
+ gtk_action_group_add_actions (priv->main_action_group, action_entries,
+@@ -432,7 +427,6 @@
+ NULL
+ };
+
+-#ifdef HAVE_GTK26
+ gtk_show_about_dialog (GTK_WINDOW (data),
+ "authors", authors,
+ "comments", _("An ALSA mixer for GNOME"),
+@@ -440,21 +434,6 @@
+ "name", _("GNOME ALSA Mixer"),
+ "version", VERSION,
+ NULL);
+-#else
+- GtkWidget *about;
+-
+- about = gnome_about_new (_("GNOME ALSA Mixer"), VERSION,
+- "\302\251 2001\342\200\2232005 PAW Digital Dynamics",
+- _("An ALSA mixer for GNOME"),
+- authors,
+- NULL,
+- NULL,
+- NULL);
+- gtk_widget_set_name (about, "about");
+- gtk_window_set_wmclass (GTK_WINDOW (about), "GAMAbout", "GAMAbout");
+- gtk_window_set_destroy_with_parent (GTK_WINDOW (about), TRUE);
+- gtk_widget_show (about);
+-#endif
+ }
+
+ static void
+diff -Naur gnome-alsamixer-0.9.7~cvs.20060916.orig/src/gam-main.c gnome-alsamixer-0.9.7~cvs.20060916/src/gam-main.c
+--- gnome-alsamixer-0.9.7~cvs.20060916.orig/src/gam-main.c 2005-07-06 17:14:57.000000000 +0200
++++ gnome-alsamixer-0.9.7~cvs.20060916/src/gam-main.c 2017-01-21 13:53:49.171980646 +0100
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ #endif
+
+-#include <gnome.h>
++#include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+
+ #include "gam-app.h"
+@@ -31,7 +31,6 @@
+ main (int argc, char *argv[])
+ {
+ GtkWidget *app;
+- GnomeProgram *prog;
+
+ #ifdef ENABLE_NLS
+ bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+@@ -39,14 +38,7 @@
+ textdomain (GETTEXT_PACKAGE);
+ #endif
+
+- prog = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE,
+- argc, argv,
+- GNOME_PARAM_HUMAN_READABLE_NAME, _("GNOME ALSA Mixer"),
+- GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR,
+- NULL);
+-
+- if (!prog)
+- return 1;
++ gtk_init (&argc, &argv);
+
+ app = gam_app_new ();
+
+diff -Naur gnome-alsamixer-0.9.7~cvs.20060916.orig/src/Makefile.am gnome-alsamixer-0.9.7~cvs.20060916/src/Makefile.am
+--- gnome-alsamixer-0.9.7~cvs.20060916.orig/src/Makefile.am 2017-01-21 14:12:24.106285737 +0100
++++ gnome-alsamixer-0.9.7~cvs.20060916/src/Makefile.am 2017-01-21 14:12:36.509963807 +0100
+@@ -4,10 +4,6 @@
+ -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\" \
+ -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGDK_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DGNOME_DISABLE_DEPRECATED \
+ @PACKAGE_CFLAGS@
+
+ bin_PROGRAMS = gnome-alsamixer
Copied: gnome-alsamixer/repos/staging-x86_64/PKGBUILD (from rev 338672, gnome-alsamixer/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-11-09 22:21:34 UTC (rev 338673)
@@ -0,0 +1,54 @@
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=gnome-alsamixer
+pkgver=0.9.7
+pkgrel=4
+pkgdesc="Gnome ALSA mixer"
+arch=('x86_64')
+url="https://launchpad.net/gnome-alsamixer"
+license=('GPL')
+depends=('alsa-lib' 'gconf' 'gtk2')
+options=('!emptydirs')
+source=(https://launchpad.net/ubuntu/+archive/primary/+files/gnome-alsamixer_0.9.7~cvs.20060916.ds.1.orig.tar.gz
+ 02_change_gconf-keys_path.patch
+ 03_gnome-alsamixer.schemas.patch
+ 04_ignore-delimiters.patch
+ 05-remove-G_CONST_RETURN.patch
+ 06-drop-libgnomeui.patch
+ gnome-alsamixer.desktop)
+sha1sums=('98e716cd14fe46cb9c77034de7558ef113da26f5'
+ 'ee7743abfc8d6005be6fcb0fb47b45e636db5fdc'
+ '6b3148bab4ed53bc9a0a123b33585cd81b138225'
+ 'd4a7f9a5868c5af52f9b3c7a146ae34ddc45adf7'
+ '6b19224d0346cf53b864333b191fa99fc8e7ebdc'
+ 'f3b72ae8d83e482573e78f48125367e9bf8c6cd2'
+ '31639f7932d088ca76a18c79839682be811f23d0')
+
+prepare() {
+ cd ${pkgname}-${pkgver}~cvs.20060916
+ patch -Np1 -i ../02_change_gconf-keys_path.patch
+ patch -Np1 -i ../03_gnome-alsamixer.schemas.patch
+ patch -Np1 -i ../04_ignore-delimiters.patch
+ patch -Np1 -i ../05-remove-G_CONST_RETURN.patch
+ patch -Np1 -i ../06-drop-libgnomeui.patch
+
+ ln -sf /usr/share/automake-*/mkinstalldirs mkinstalldirs
+ autoreconf -fi
+}
+
+build() {
+ cd ${pkgname}-${pkgver}~cvs.20060916
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-schemas-install \
+ --with-gconf-schema-file-dir=/usr/share/gconf/schemas
+ make MSGFMT_OPTS="-c" LIBS+="-lm"
+}
+
+package() {
+ cd ${pkgname}-${pkgver}~cvs.20060916
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 "${srcdir}/gnome-alsamixer.desktop" "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop"
+}
Copied: gnome-alsamixer/repos/staging-x86_64/gnome-alsamixer.desktop (from rev 338672, gnome-alsamixer/trunk/gnome-alsamixer.desktop)
===================================================================
--- staging-x86_64/gnome-alsamixer.desktop (rev 0)
+++ staging-x86_64/gnome-alsamixer.desktop 2018-11-09 22:21:34 UTC (rev 338673)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=GNOME ALSA Mixer
+Comment=ALSA sound mixer for GNOME
+Comment[es]=Mezclador de sonido ALSA para GNOME
+Comment[fr]=Mélangeur de son ALSA pour GNOME
+Exec=gnome-alsamixer
+Icon=/usr/share/pixmaps/gnome-alsamixer/gnome-alsamixer-icon.png
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
+StartupNotify=true
More information about the arch-commits
mailing list