diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2016-06-30 20:26:57 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 23:31:18 +0200 |
| commit | d31c50870d0bee042ce660e445c9294a59a3a65b (patch) | |
| tree | 6bfc0de3c95267b401b620c2c67859557dc60f97 /pasture/source/xfce4-mixer/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch | |
| parent | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff) | |
| download | current-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz | |
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016
Slackware 14.2 x86_64 stable is released!
The long development cycle (the Linux community has lately been living in
"interesting times", as they say) is finally behind us, and we're proud to
announce the release of Slackware 14.2. The new release brings many updates
and modern tools, has switched from udev to eudev (no systemd), and adds
well over a hundred new packages to the system. Thanks to the team, the
upstream developers, the dedicated Slackware community, and everyone else
who pitched in to help make this release a reality.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Have fun! :-)
Diffstat (limited to 'pasture/source/xfce4-mixer/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch')
| -rw-r--r-- | pasture/source/xfce4-mixer/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/pasture/source/xfce4-mixer/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch b/pasture/source/xfce4-mixer/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch new file mode 100644 index 00000000..f0b32dad --- /dev/null +++ b/pasture/source/xfce4-mixer/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch @@ -0,0 +1,63 @@ +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 + |