diff options
Diffstat (limited to '')
-rw-r--r-- | pasture/source/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch | 37 | ||||
-rw-r--r-- | pasture/source/xfce4-volumed/0003-Removing-edge-case-memleaks.patch | 80 | ||||
-rw-r--r-- | pasture/source/xfce4-volumed/slack-desc (renamed from source/xfce/xfce4-volumed/slack-desc) | 0 | ||||
-rwxr-xr-x | pasture/source/xfce4-volumed/xfce4-volumed.SlackBuild (renamed from source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild) | 11 |
4 files changed, 124 insertions, 4 deletions
diff --git a/pasture/source/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch b/pasture/source/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch new file mode 100644 index 000000000..f3f43ea1f --- /dev/null +++ b/pasture/source/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch @@ -0,0 +1,37 @@ +From 2ee3b12be641501ee3a9ce0278291b8c5a865021 Mon Sep 17 00:00:00 2001 +From: Steve Dodier <sidnioulz@gmail.com> +Date: Thu, 3 Mar 2011 11:43:26 +0100 +Subject: [PATCH 1/3] Removed deprecated "Encoding" entry in .desktop file + (thanks to Samuli Suominen) + +--- + ChangeLog | 3 +++ + data/xfce4-volumed.desktop | 1 - + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/ChangeLog b/ChangeLog +index e1690ba..beeb5f6 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,4 +1,7 @@ + 2011-03-03 Steve Dodier <sidnioulz@gmail.com> ++ * Removed deprecated "Encoding" entry in .desktop file (thanks to Samuli Suominen) ++ ++2011-03-03 Steve Dodier <sidnioulz@gmail.com> + * Allow compatibility with Libnotify 0.7 (thanks to Samuli Suominen for the patch) + + 2011-03-03 Steve Dodier <sidnioulz@gmail.com> +diff --git a/data/xfce4-volumed.desktop b/data/xfce4-volumed.desktop +index 8ac7dc7..be362c5 100644 +--- a/data/xfce4-volumed.desktop ++++ b/data/xfce4-volumed.desktop +@@ -1,6 +1,5 @@ + + [Desktop Entry] +-Encoding=UTF-8 + Type=Application + Terminal=false + Name=XFCE Volume Daemon +-- +2.3.0 + diff --git a/pasture/source/xfce4-volumed/0003-Removing-edge-case-memleaks.patch b/pasture/source/xfce4-volumed/0003-Removing-edge-case-memleaks.patch new file mode 100644 index 000000000..8d45bae32 --- /dev/null +++ b/pasture/source/xfce4-volumed/0003-Removing-edge-case-memleaks.patch @@ -0,0 +1,80 @@ +From ac129e178c24d7ec79b020a7912cc680a6008c5b Mon Sep 17 00:00:00 2001 +From: Steve Dodier-Lazaro <sidnioulz@gmail.com> +Date: Wed, 10 Dec 2014 03:38:32 +0000 +Subject: [PATCH 3/3] Removing edge-case memleaks + +--- + src/main.c | 2 +- + src/xvd_mixer.c | 30 ++++++++++++++++++------------ + 2 files changed, 19 insertions(+), 13 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 18e8e01..d04920c 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -81,7 +81,7 @@ xvd_shutdown() + xvd_keys_release (Inst); + xvd_xfconf_shutdown (Inst); + +- //TODO xvd_instance_free ++ g_free (Inst); + } + + static void +diff --git a/src/xvd_mixer.c b/src/xvd_mixer.c +index 1d580bf..cef3151 100644 +--- a/src/xvd_mixer.c ++++ b/src/xvd_mixer.c +@@ -102,31 +102,37 @@ _xvd_mixer_bus_message (GstBus *bus, GstMessage *message, + { + gst_mixer_message_parse_mute_toggled (message, &msg_track, &Inst->muted); + g_object_get (msg_track, "label", &label, NULL); +- if (g_strcmp0 (Inst->track_label, label) != 0) +- return; ++ ++ if (g_strcmp0 (Inst->track_label, label) == 0) ++ { + #ifdef HAVE_LIBNOTIFY +- if (Inst->muted) +- xvd_notify_notification (Inst, "audio-volume-muted", 0); +- else { +- xvd_mixer_init_volume (Inst); +- xvd_notify_volume_notification (Inst); ++ if (Inst->muted) ++ xvd_notify_notification (Inst, "audio-volume-muted", 0); ++ else { ++ xvd_mixer_init_volume (Inst); ++ xvd_notify_volume_notification (Inst); + #endif ++ } + } ++ + g_free (label); + } + else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED) + { + gst_mixer_message_parse_volume_changed (message, &msg_track, &volumes, &num_channels); + g_object_get (msg_track, "label", &label, NULL); +- if (g_strcmp0 (Inst->track_label, label) != 0) +- return; +- xvd_calculate_avg_volume (Inst, volumes, num_channels); ++ if (g_strcmp0 (Inst->track_label, label) == 0) ++ { ++ xvd_calculate_avg_volume (Inst, volumes, num_channels); + #ifdef HAVE_LIBNOTIFY +- xvd_notify_volume_notification (Inst); ++ xvd_notify_volume_notification (Inst); + #endif ++ } ++ + g_free (label); + } +- else if (type == GST_MIXER_MESSAGE_MIXER_CHANGED) { ++ else if (type == GST_MIXER_MESSAGE_MIXER_CHANGED) ++ { + // This kind of message shouldn't happen on an hardware card + g_debug ("GST_MIXER_MESSAGE_MIXER_CHANGED event\n"); + } +-- +2.3.0 + diff --git a/source/xfce/xfce4-volumed/slack-desc b/pasture/source/xfce4-volumed/slack-desc index e9266cbca..e9266cbca 100644 --- a/source/xfce/xfce4-volumed/slack-desc +++ b/pasture/source/xfce4-volumed/slack-desc diff --git a/source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild b/pasture/source/xfce4-volumed/xfce4-volumed.SlackBuild index 147716ea1..d1123f784 100755 --- a/source/xfce/xfce4-volumed/xfce4-volumed.SlackBuild +++ b/pasture/source/xfce4-volumed/xfce4-volumed.SlackBuild @@ -26,11 +26,11 @@ PKGNAM=xfce4-volumed VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; @@ -43,8 +43,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -70,6 +70,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch +patch -p1 < $CWD/0003-Removing-edge-case-memleaks.patch + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ |