diff options
Diffstat (limited to '')
-rw-r--r-- | testing/source/vtown/xfce/xfce4-pulseaudio-plugin/slack-desc | 19 | ||||
-rw-r--r-- | testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4-gtk3_theme.patch | 12 | ||||
-rw-r--r-- | testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4-gtk3_theme_clean.patch | 12 | ||||
-rwxr-xr-x | testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild (renamed from testing/source/vtown/deps/upower/upower.SlackBuild) | 95 | ||||
-rw-r--r-- | testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url | 1 |
5 files changed, 90 insertions, 49 deletions
diff --git a/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/slack-desc b/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/slack-desc new file mode 100644 index 000000000..020d8f626 --- /dev/null +++ b/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +xfce4-pulseaudio-plugin: xfce4-pulseaudio-plugin (PulseAudio plugin for Xfce panel) +xfce4-pulseaudio-plugin: +xfce4-pulseaudio-plugin: xfce4-pulseaudio-plugin is a plugin for the Xfce panel which provides +xfce4-pulseaudio-plugin: a convenient way to adjust the audio volume of the PulseAudio sound +xfce4-pulseaudio-plugin: system and to an auto mixer tool like pavucontrol. It can optionally +xfce4-pulseaudio-plugin: handle multimedia keys for controlling the audio volume. +xfce4-pulseaudio-plugin: +xfce4-pulseaudio-plugin: +xfce4-pulseaudio-plugin: +xfce4-pulseaudio-plugin: +xfce4-pulseaudio-plugin: diff --git a/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4-gtk3_theme.patch b/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4-gtk3_theme.patch new file mode 100644 index 000000000..717cfbe1e --- /dev/null +++ b/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4-gtk3_theme.patch @@ -0,0 +1,12 @@ +diff -U3 -d -r -N xfce4-pulseaudio-plugin-0.2.4/panel-plugin/pulseaudio-button.c xfce4-pulseaudio-plugin-0.2.4.fixed/panel-plugin/pulseaudio-button.c +--- xfce4-pulseaudio-plugin-0.2.4/panel-plugin/pulseaudio-button.c 2015-06-06 23:57:55.000000000 +0200 ++++ xfce4-pulseaudio-plugin-0.2.4.fixed/panel-plugin/pulseaudio-button.c 2016-06-22 21:51:07.258482863 +0200 +@@ -137,7 +137,7 @@ + + /* Setup Gtk style */ + css_provider = gtk_css_provider_new (); +- gtk_css_provider_load_from_data (css_provider, "#pulseaudio-button { -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; -GtkButton-default-border: 0; -GtkButton-inner-border: 0; padding: 1px; border-width: 1px;}", -1, NULL); ++ gtk_css_provider_load_from_data (css_provider, "#pulseaudio-button { -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; -GtkButton-default-border: 0; -GtkButton-inner-border: 0; padding: 1px; border-width: 0px; border-radius: 0px; background-color:@theme_bg_color;}", -1, NULL); + gtk_style_context_add_provider (GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (button))), GTK_STYLE_PROVIDER (css_provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + + /* Intercept scroll events */ diff --git a/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4-gtk3_theme_clean.patch b/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4-gtk3_theme_clean.patch new file mode 100644 index 000000000..5f9358b42 --- /dev/null +++ b/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4-gtk3_theme_clean.patch @@ -0,0 +1,12 @@ +diff -U3 -d -r -N xfce4-pulseaudio-plugin-0.2.4/panel-plugin/pulseaudio-button.c xfce4-pulseaudio-plugin-0.2.4.fixed/panel-plugin/pulseaudio-button.c +--- xfce4-pulseaudio-plugin-0.2.4/panel-plugin/pulseaudio-button.c 2015-06-06 23:57:55.000000000 +0200 ++++ xfce4-pulseaudio-plugin-0.2.4.fixed/panel-plugin/pulseaudio-button.c 2016-06-22 21:51:07.258482863 +0200 +@@ -137,7 +137,7 @@ + + /* Setup Gtk style */ + css_provider = gtk_css_provider_new (); +- gtk_css_provider_load_from_data (css_provider, "#pulseaudio-button { -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; -GtkButton-default-border: 0; -GtkButton-inner-border: 0; padding: 1px; border-width: 1px;}", -1, NULL); ++ gtk_css_provider_load_from_data (css_provider, "#pulseaudio-button { -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; -GtkButton-default-border: 0; -GtkButton-inner-border: 0; padding: 0px; border-width: 5px; border-radius: 13px; color:@theme_fg_color;}", -1, NULL); + gtk_style_context_add_provider (GTK_STYLE_CONTEXT (gtk_widget_get_style_context (GTK_WIDGET (button))), GTK_STYLE_PROVIDER (css_provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + + /* Intercept scroll events */ diff --git a/testing/source/vtown/deps/upower/upower.SlackBuild b/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild index ddd7e2183..66eb3fa84 100755 --- a/testing/source/vtown/deps/upower/upower.SlackBuild +++ b/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild @@ -1,8 +1,8 @@ #!/bin/bash -# Slackware build script for upower +# Slackware build script for xfce4-pulseaudio-plugin -# Copyright 2010, 2011, 2015 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2015 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,25 +22,17 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port. - cd $(dirname $0) ; CWD=$(pwd) -PKGNAM=upower -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +PKGNAM=xfce4-pulseaudio-plugin +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1_vtown_1} -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + case "$( uname -m )" in + i?86) ARCH=i586 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; esac fi @@ -52,6 +44,11 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -61,22 +58,11 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi -case "$ARCH" in - arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; - *) TARGET=$ARCH-slackware-linux ;; -esac - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -86,51 +72,62 @@ cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ + +# These are proposed patches to fix the background color of the plugin icon. +# However, both of them have some issues with artifacts or with changing the +# dimensions of the icon in unpleasant ways. Supposedly the correct way to +# fix the issue is in the theme css, but since it's an issue with GTK+2 and +# GTK+3 not getting along, few theme maintainers can be bothered with this +# since GNOME has moved on to GTK+3. +# +# If you want to try them, apply one or the other. Unless the theme you're using +# supports both GTK+2 and GTK+3 it's not likely to help, though. + +# Patch one (thanks to DarkVision): +#zcat ${CWD}/xfce4-pulseaudio-plugin-0.2.4-gtk3_theme.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0002-linux-Fix-memory-leak-in-Bluez-backend.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0003-linux-Fix-warning-when-bluez-Appearance-property-isn.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0006-lib-Add-Pen-device-type.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0007-linux-Detect-Bluetooth-pens.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0008-linux-Identify-keyboard-pointing-device-combos-as-ke.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0011-linux-Add-support-for-iPhone-XR-XS-models.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/0012-build-Use-a-newer-libplist-if-available.patch.gz | patch -p1 --verbose || exit 1 +# Patch two (thanks to Jean-Philippe Guillemin): +#zcat ${CWD}/xfce4-pulseaudio-plugin-0.2.4-gtk3_theme_clean.patch.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ + --sysconfdir=/etc/xfce \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-static \ - --enable-man-pages \ - --build=$TARGET || exit 1 + --disable-debug \ + --enable-libnotify \ + --enable-keybinder \ + --with-mixer-command=pavucontrol \ + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Don't clobber the config file on upgrades -mv $PKG/etc/UPower/UPower.conf $PKG/etc/UPower/UPower.conf.new - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +gzip -9 $PKG/usr/man/man?/*.? mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \ + AUTHORS COPYING* NEWS README* THANKS \ $PKG/usr/doc/$PKGNAM-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url b/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url new file mode 100644 index 000000000..4376b0a53 --- /dev/null +++ b/testing/source/vtown/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.0.tar.bz2 |