mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
646a5c1cbf
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
From a60d7b81674449d1753fcf8bb15c57fc178424e6 Mon Sep 17 00:00:00 2001
|
|
From: Robby Workman <rworkman@slackware.com>
|
|
Date: Thu, 19 Feb 2015 19:36:21 -0600
|
|
Subject: [PATCH 1/2] Use $(datadir)/xfce4/mixer/ as MIXER_DATADIR
|
|
|
|
Follow common practice of other Xfce componenets and use
|
|
$(datadir)/xfce4/mixer/ instead of $(datadir)/xfce4-mixer/.
|
|
---
|
|
icons/16x16/Makefile.am | 2 +-
|
|
icons/scalable/Makefile.am | 2 +-
|
|
libxfce4mixer/Makefile.am | 2 +-
|
|
xfce4-mixer/Makefile.am | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
|
|
index 803a2e4..ace4a07 100644
|
|
--- a/icons/16x16/Makefile.am
|
|
+++ b/icons/16x16/Makefile.am
|
|
@@ -1,4 +1,4 @@
|
|
-iconsdir = $(pkgdatadir)/icons/hicolor/16x16/status
|
|
+iconsdir = $(datadir)/xfce4/mixer/icons/hicolor/16x16/status
|
|
icons_DATA = audio-input-microphone-muted.png
|
|
|
|
EXTRA_DIST = $(icons_DATA)
|
|
diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am
|
|
index 5bfc12c..5212e63 100644
|
|
--- a/icons/scalable/Makefile.am
|
|
+++ b/icons/scalable/Makefile.am
|
|
@@ -1,4 +1,4 @@
|
|
-iconsdir = $(pkgdatadir)/icons/hicolor/scalable/status
|
|
+iconsdir = $(datadir)/xfce4/mixer/icons/hicolor/scalable/status
|
|
icons_DATA = audio-input-microphone-muted.svg
|
|
|
|
EXTRA_DIST = $(icons_DATA)
|
|
diff --git a/libxfce4mixer/Makefile.am b/libxfce4mixer/Makefile.am
|
|
index 792a95e..e864ea8 100644
|
|
--- a/libxfce4mixer/Makefile.am
|
|
+++ b/libxfce4mixer/Makefile.am
|
|
@@ -25,7 +25,7 @@ libxfce4mixer_la_CPPFLAGS = \
|
|
-DDATADIR=\"$(datadir)\" \
|
|
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
|
|
-DG_LOG_DOMAIN=\"libxfce4mixer\" \
|
|
- -DMIXER_DATADIR=\"$(pkgdatadir)\"
|
|
+ -DMIXER_DATADIR=\"$(datadir)/xfce4/mixer\"
|
|
|
|
libxfce4mixer_la_CFLAGS = \
|
|
$(PLATFORM_CFLAGS) \
|
|
diff --git a/xfce4-mixer/Makefile.am b/xfce4-mixer/Makefile.am
|
|
index 4af69e9..f979b92 100644
|
|
--- a/xfce4-mixer/Makefile.am
|
|
+++ b/xfce4-mixer/Makefile.am
|
|
@@ -23,7 +23,7 @@ xfce4_mixer_CPPFLAGS = \
|
|
-I$(top_srcdir) \
|
|
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
|
|
-DDATADIR=\"$(datadir)\" \
|
|
- -DMIXER_DATADIR=\"$(pkgdatadir)\" \
|
|
+ -DMIXER_DATADIR=\"$(datadir)/xfce4/mixer\" \
|
|
-DG_LOG_DOMAIN=\"xfce4-mixer\"
|
|
|
|
xfce4_mixer_CFLAGS = \
|
|
--
|
|
2.3.1
|
|
|