diff options
Diffstat (limited to 'extra/gnome-alsamixer')
| -rw-r--r-- | extra/gnome-alsamixer/02_change_gconf-keys_path.diff | 207 | ||||
| -rw-r--r-- | extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff | 174 | ||||
| -rw-r--r-- | extra/gnome-alsamixer/04_ignore-delimiters.diff | 15 | ||||
| -rw-r--r-- | extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch | 111 | ||||
| -rw-r--r-- | extra/gnome-alsamixer/06-use-libgnome-headers.patch | 26 | ||||
| -rw-r--r-- | extra/gnome-alsamixer/PKGBUILD | 51 | ||||
| -rw-r--r-- | extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch | 15 | ||||
| -rw-r--r-- | extra/gnome-alsamixer/gnome-alsamixer.install | 19 |
8 files changed, 586 insertions, 32 deletions
diff --git a/extra/gnome-alsamixer/02_change_gconf-keys_path.diff b/extra/gnome-alsamixer/02_change_gconf-keys_path.diff new file mode 100644 index 000000000..6df8bc903 --- /dev/null +++ b/extra/gnome-alsamixer/02_change_gconf-keys_path.diff @@ -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@diwi.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace path to gnome-alsamixer's gconf keys + +@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)), diff --git a/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff b/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff new file mode 100644 index 000000000..91630a6d3 --- /dev/null +++ b/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff @@ -0,0 +1,174 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_gnome-alsamixer.schemas.dpatch.dpatch by Mohammed Adnène Trojette <adn+deb@diwi.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Intent to guess gnome-alsamixer.schemas + +@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> diff --git a/extra/gnome-alsamixer/04_ignore-delimiters.diff b/extra/gnome-alsamixer/04_ignore-delimiters.diff new file mode 100644 index 000000000..3e00e9205 --- /dev/null +++ b/extra/gnome-alsamixer/04_ignore-delimiters.diff @@ -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)) diff --git a/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch b/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch new file mode 100644 index 000000000..0a352867b --- /dev/null +++ b/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch @@ -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); diff --git a/extra/gnome-alsamixer/06-use-libgnome-headers.patch b/extra/gnome-alsamixer/06-use-libgnome-headers.patch new file mode 100644 index 000000000..5c431f02b --- /dev/null +++ b/extra/gnome-alsamixer/06-use-libgnome-headers.patch @@ -0,0 +1,26 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-main.c 2005-07-06 17:14:57.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c 2011-10-26 02:47:47.000000000 +0200 +@@ -22,7 +22,7 @@ + #include <config.h> + #endif + +-#include <gnome.h> ++#include <libgnomeui/gnome-ui-init.h> + #include <glib/gi18n.h> + + #include "gam-app.h" +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.c 2011-10-26 02:47:21.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c 2011-10-26 02:47:21.000000000 +0200 +@@ -27,7 +27,7 @@ + #include <gtk/gtkmenuitem.h> + #include <glib/gi18n.h> + #include <libgnomeui/gnome-about.h> +-#include <libgnomeui/gnome-app-helper.h> ++/*#include <libgnomeui/gnome-app-helper.h>*/ + #include <libgnomeui/gnome-stock-icons.h> + + #include "gam-app.h" diff --git a/extra/gnome-alsamixer/PKGBUILD b/extra/gnome-alsamixer/PKGBUILD index 84698b9c1..677260758 100644 --- a/extra/gnome-alsamixer/PKGBUILD +++ b/extra/gnome-alsamixer/PKGBUILD @@ -1,33 +1,50 @@ -# $Id: PKGBUILD 136003 2011-08-21 09:18:58Z eric $ +# $Id: PKGBUILD 189332 2013-07-03 05:25:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gnome-alsamixer -pkgver=0.9.6 -pkgrel=4 +pkgver=0.9.7 +pkgrel=1 pkgdesc="Gnome ALSA mixer" arch=('i686' 'x86_64') url="https://launchpad.net/gnome-alsamixer" license=('GPL') depends=('libgnomeui') -source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz - gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop) -md5sums=('387623cfeb079d78325eed2d6bc94251' - '82b95a0df43429da5098b4da883f6bd0' - 'c7dbc44207bede96e4fafc24a7c7beb3') -sha1sums=('faece601a4329d2b01b9efe65200021538fc066d' - 'b4e3b871676025600170ba54f59db4977b853c08' +options=('!emptydirs') +install=gnome-alsamixer.install +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.diff 03_gnome-alsamixer.schemas.diff 04_ignore-delimiters.diff + 05-remove-G_CONST_RETURN.patch 06-use-libgnome-headers.patch gnome-alsamixer.desktop) +sha1sums=('98e716cd14fe46cb9c77034de7558ef113da26f5' + 'ee7743abfc8d6005be6fcb0fb47b45e636db5fdc' + '6b3148bab4ed53bc9a0a123b33585cd81b138225' + 'd4a7f9a5868c5af52f9b3c7a146ae34ddc45adf7' + '6b19224d0346cf53b864333b191fa99fc8e7ebdc' + '2731a7ef249aac51eeab1717c645c995780f36a7' '31639f7932d088ca76a18c79839682be811f23d0') +prepare() { + cd ${pkgname}-${pkgver}~cvs.20060916 + patch -Np1 -i ../02_change_gconf-keys_path.diff + patch -Np1 -i ../03_gnome-alsamixer.schemas.diff + patch -Np1 -i ../04_ignore-delimiters.diff + patch -Np1 -i ../05-remove-G_CONST_RETURN.patch + patch -Np1 -i ../06-use-libgnome-headers.patch + + ln -sf /usr/share/automake-*/mkinstalldirs mkinstalldirs +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" + cd ${pkgname}-${pkgver}~cvs.20060916 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make + make MSGFMT_OPTS="-c" LIBS+="-lm" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \ - "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" + cd ${pkgname}-${pkgver}~cvs.20060916 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/gnome-alsamixer.desktop" "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" + + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch b/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch deleted file mode 100644 index 9e5f4eeb1..000000000 --- a/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur gnome-alsamixer-0.9.6/src/Makefile.in gnome-alsamixer-0.9.6.new/src/Makefile.in ---- gnome-alsamixer-0.9.6/src/Makefile.in 2003-09-09 12:44:25.000000000 +0100 -+++ gnome-alsamixer-0.9.6.new/src/Makefile.in 2004-04-04 18:51:36.000000000 +0100 -@@ -86,10 +86,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@ - - -Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~ diff --git a/extra/gnome-alsamixer/gnome-alsamixer.install b/extra/gnome-alsamixer/gnome-alsamixer.install new file mode 100644 index 000000000..2787d5675 --- /dev/null +++ b/extra/gnome-alsamixer/gnome-alsamixer.install @@ -0,0 +1,19 @@ +pkgname=gnome-alsamixer + +post_install() { + gconfpkg --install ${pkgname} +} + +pre_upgrade() { + if [[ "$(vercmp $2 0.9.7)" -gt 0 ]]; then + pre_remove $1 + fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall ${pkgname} +} |