mirror of
git://slackware.nl/current.git
synced 2024-12-26 09:58:59 +01:00
Fri Dec 25 00:52:08 UTC 2020
Here are some updates to provide a little holiday cheer. The kernels are rebuilt (yeah, we'll probably have new ones tomorrow but whatever) to build in HWMON making NVMe temperature monitoring available, and there's also a massive cleanup of polkit/dbus related packages to move most of the config files out of /etc and not install them as .new. Local config files that override the shipped ones may be placed in the directories in /etc to override the ones that we ship. Thanks to Robby Workman for this! None of the packages included in Slackware place any files in /etc/polkit-1/rules.d/ or /etc/dbus-1/system.d/ any more, but there may be third-party packages that still do. However, since Slackware's packages originally installed these as .new files, the leftover configs will remain. You'll probably want to take a look in those directories to clean out any config files that you haven't modified yourself or that belong to packages that aren't part of Slackware itself. Hope everyone has a great day. :-) a/dbus-1.12.20-x86_64-3.txz: Rebuilt. Added local config override directory /etc/dbus-1/system.d/ since no other package provides it now. a/kernel-generic-5.10.2-x86_64-2.txz: Upgraded. a/kernel-huge-5.10.2-x86_64-2.txz: Upgraded. a/kernel-modules-5.10.2-x86_64-2.txz: Upgraded. a/udisks-1.0.5-x86_64-6.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. a/udisks2-2.9.1-x86_64-2.txz: Rebuilt. Include 20-plugdev-group-mount-override.rules, installed in the system location. Thanks to Robby Workman. ap/cups-2.3.3-x86_64-3.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. ap/hplip-3.20.6-x86_64-4.txz: Rebuilt. Use --enable-qt5. Move D-Bus configs from /etc to the system location. Drop HAL support (LOL!) Thanks to Robby Workman. ap/mpg123-1.26.4-x86_64-1.txz: Upgraded. d/gnucobol-3.1.2-x86_64-1.txz: Upgraded. d/kernel-headers-5.10.2-x86-2.txz: Upgraded. k/kernel-source-5.10.2-noarch-2.txz: Upgraded. HWMON m -> y +NVME_HWMON y +POWER_SUPPLY_HWMON y +THERMAL_HWMON y Thanks to Daedra. kde/sddm-0.19.0-x86_64-4.txz: Rebuilt. Don't include the /etc/dbus-1/system.d/ directory. l/GConf-3.2.6-x86_64-5.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. l/accountsservice-0.6.55-x86_64-2.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. l/cryptopp-8.3.0-x86_64-1.txz: Upgraded. l/harfbuzz-2.7.3-x86_64-1.txz: Upgraded. l/polkit-0.118-x86_64-3.txz: Rebuilt. Remove D-Bus rules for udisks2 and NetworkManager (moved to those packages). Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. l/pulseaudio-14.0-x86_64-2.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. l/system-config-printer-1.5.12-x86_64-6.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. n/ModemManager-1.14.8-x86_64-2.txz: Rebuilt. Added elogind support. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. n/NetworkManager-1.28.0-x86_64-2.txz: Rebuilt. Include 10-org.freedesktop.NetworkManager.rules, installed in the system location. Thanks to Robby Workman. n/bluez-5.55-x86_64-2.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. n/netatalk-3.1.12-x86_64-5.txz: Rebuilt. Patched to fix failure to build from source with gcc10. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. n/wpa_supplicant-2.9-x86_64-3.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. x/mesa-20.3.1-x86_64-2.txz: Rebuilt. [PATCH] vulkan/device_select: Store Vulkan vendorID and deviceID as uint32_t. Thanks to sasha69 for the link to the upstream discussion/commit. xap/blueman-2.1.4-x86_64-3.txz: Rebuilt. Move D-Bus configs from /etc to the system location. Thanks to Robby Workman. xap/xgames-0.3-x86_64-6.txz: Rebuilt. Fixed spider failing to build from source with gcc10. Removed the ancient version of xsnow. xap/xscreensaver-5.45-x86_64-2.txz: Rebuilt. Make the description of the xscreensaver settings be clearly for xscreensaver as opposed to a generic "screensaver" settings. Thanks to Robby Workman. xap/xsnow-3.1.9-x86_64-1.txz: Added. Merry Christmas / Happy Holidays! :-) xfce/mousepad-0.5.1-x86_64-1.txz: Upgraded. xfce/xfce4-screensaver-0.1.11-x86_64-2.txz: Rebuilt. Make the description of the xfce4-screensaver settings be clearly for xfce4-screensaver as opposed to a generic "screensaver" settings. Thanks to Robby Workman. xfce/xfce4-session-4.14.2-x86_64-2.txz: Rebuilt. Use xfce4-screensaver by default and don't ship the xscreensaver.desktop autostart file. Thanks to Robby Workman. extra/pure-alsa-system/*: Removed. This served a purpose during the pure ALSA to PulseAudio transition, but it's time for it to go away. If the latency is an issue for your use case, a look around should turn up documentation on how to reduce it, or how to send output directly to ALSA without having to uninstall PulseAudio or recompile anything that's linked to it. As an example, see this one (which was mentioned here before): https://wiki.archlinux.org/index.php/PulseAudio/Examples#PulseAudio_as_a_minimal_unintrusive_dumb_pipe_to_ALSA isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
This commit is contained in:
parent
84c2304885
commit
0cde31b79d
68 changed files with 7123 additions and 7301 deletions
118
ChangeLog.rss
118
ChangeLog.rss
|
@ -11,9 +11,123 @@
|
||||||
<description>Tracking Slackware development in git.</description>
|
<description>Tracking Slackware development in git.</description>
|
||||||
<language>en-us</language>
|
<language>en-us</language>
|
||||||
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
|
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
|
||||||
<pubDate>Wed, 23 Dec 2020 21:21:34 GMT</pubDate>
|
<pubDate>Fri, 25 Dec 2020 00:52:08 GMT</pubDate>
|
||||||
<lastBuildDate>Thu, 24 Dec 2020 07:59:42 GMT</lastBuildDate>
|
<lastBuildDate>Fri, 25 Dec 2020 07:59:44 GMT</lastBuildDate>
|
||||||
<generator>maintain_current_git.sh v 1.12</generator>
|
<generator>maintain_current_git.sh v 1.12</generator>
|
||||||
|
<item>
|
||||||
|
<title>Fri, 25 Dec 2020 00:52:08 GMT</title>
|
||||||
|
<pubDate>Fri, 25 Dec 2020 00:52:08 GMT</pubDate>
|
||||||
|
<link>https://git.slackware.nl/current/tag/?h=20201225005208</link>
|
||||||
|
<guid isPermaLink="false">20201225005208</guid>
|
||||||
|
<description>
|
||||||
|
<![CDATA[<pre>
|
||||||
|
Here are some updates to provide a little holiday cheer. The kernels are
|
||||||
|
rebuilt (yeah, we'll probably have new ones tomorrow but whatever) to build in
|
||||||
|
HWMON making NVMe temperature monitoring available, and there's also a massive
|
||||||
|
cleanup of polkit/dbus related packages to move most of the config files out
|
||||||
|
of /etc and not install them as .new. Local config files that override the
|
||||||
|
shipped ones may be placed in the directories in /etc to override the ones that
|
||||||
|
we ship. Thanks to Robby Workman for this!
|
||||||
|
None of the packages included in Slackware place any files in
|
||||||
|
/etc/polkit-1/rules.d/ or /etc/dbus-1/system.d/ any more, but there may be
|
||||||
|
third-party packages that still do. However, since Slackware's packages
|
||||||
|
originally installed these as .new files, the leftover configs will remain.
|
||||||
|
You'll probably want to take a look in those directories to clean out any
|
||||||
|
config files that you haven't modified yourself or that belong to packages that
|
||||||
|
aren't part of Slackware itself.
|
||||||
|
Hope everyone has a great day. :-)
|
||||||
|
a/dbus-1.12.20-x86_64-3.txz: Rebuilt.
|
||||||
|
Added local config override directory /etc/dbus-1/system.d/ since no other
|
||||||
|
package provides it now.
|
||||||
|
a/kernel-generic-5.10.2-x86_64-2.txz: Upgraded.
|
||||||
|
a/kernel-huge-5.10.2-x86_64-2.txz: Upgraded.
|
||||||
|
a/kernel-modules-5.10.2-x86_64-2.txz: Upgraded.
|
||||||
|
a/udisks-1.0.5-x86_64-6.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
a/udisks2-2.9.1-x86_64-2.txz: Rebuilt.
|
||||||
|
Include 20-plugdev-group-mount-override.rules, installed in the system
|
||||||
|
location. Thanks to Robby Workman.
|
||||||
|
ap/cups-2.3.3-x86_64-3.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
ap/hplip-3.20.6-x86_64-4.txz: Rebuilt.
|
||||||
|
Use --enable-qt5.
|
||||||
|
Move D-Bus configs from /etc to the system location.
|
||||||
|
Drop HAL support (LOL!)
|
||||||
|
Thanks to Robby Workman.
|
||||||
|
ap/mpg123-1.26.4-x86_64-1.txz: Upgraded.
|
||||||
|
d/gnucobol-3.1.2-x86_64-1.txz: Upgraded.
|
||||||
|
d/kernel-headers-5.10.2-x86-2.txz: Upgraded.
|
||||||
|
k/kernel-source-5.10.2-noarch-2.txz: Upgraded.
|
||||||
|
HWMON m -> y
|
||||||
|
+NVME_HWMON y
|
||||||
|
+POWER_SUPPLY_HWMON y
|
||||||
|
+THERMAL_HWMON y
|
||||||
|
Thanks to Daedra.
|
||||||
|
kde/sddm-0.19.0-x86_64-4.txz: Rebuilt.
|
||||||
|
Don't include the /etc/dbus-1/system.d/ directory.
|
||||||
|
l/GConf-3.2.6-x86_64-5.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
l/accountsservice-0.6.55-x86_64-2.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
l/cryptopp-8.3.0-x86_64-1.txz: Upgraded.
|
||||||
|
l/harfbuzz-2.7.3-x86_64-1.txz: Upgraded.
|
||||||
|
l/polkit-0.118-x86_64-3.txz: Rebuilt.
|
||||||
|
Remove D-Bus rules for udisks2 and NetworkManager (moved to those packages).
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
l/pulseaudio-14.0-x86_64-2.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
l/system-config-printer-1.5.12-x86_64-6.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
n/ModemManager-1.14.8-x86_64-2.txz: Rebuilt.
|
||||||
|
Added elogind support.
|
||||||
|
Move D-Bus configs from /etc to the system location.
|
||||||
|
Thanks to Robby Workman.
|
||||||
|
n/NetworkManager-1.28.0-x86_64-2.txz: Rebuilt.
|
||||||
|
Include 10-org.freedesktop.NetworkManager.rules, installed in the system
|
||||||
|
location. Thanks to Robby Workman.
|
||||||
|
n/bluez-5.55-x86_64-2.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
n/netatalk-3.1.12-x86_64-5.txz: Rebuilt.
|
||||||
|
Patched to fix failure to build from source with gcc10.
|
||||||
|
Move D-Bus configs from /etc to the system location.
|
||||||
|
Thanks to Robby Workman.
|
||||||
|
n/wpa_supplicant-2.9-x86_64-3.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
x/mesa-20.3.1-x86_64-2.txz: Rebuilt.
|
||||||
|
[PATCH] vulkan/device_select: Store Vulkan vendorID and deviceID as uint32_t.
|
||||||
|
Thanks to sasha69 for the link to the upstream discussion/commit.
|
||||||
|
xap/blueman-2.1.4-x86_64-3.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
xap/xgames-0.3-x86_64-6.txz: Rebuilt.
|
||||||
|
Fixed spider failing to build from source with gcc10.
|
||||||
|
Removed the ancient version of xsnow.
|
||||||
|
xap/xscreensaver-5.45-x86_64-2.txz: Rebuilt.
|
||||||
|
Make the description of the xscreensaver settings be clearly for xscreensaver
|
||||||
|
as opposed to a generic "screensaver" settings. Thanks to Robby Workman.
|
||||||
|
xap/xsnow-3.1.9-x86_64-1.txz: Added.
|
||||||
|
Merry Christmas / Happy Holidays! :-)
|
||||||
|
xfce/mousepad-0.5.1-x86_64-1.txz: Upgraded.
|
||||||
|
xfce/xfce4-screensaver-0.1.11-x86_64-2.txz: Rebuilt.
|
||||||
|
Make the description of the xfce4-screensaver settings be clearly for
|
||||||
|
xfce4-screensaver as opposed to a generic "screensaver" settings.
|
||||||
|
Thanks to Robby Workman.
|
||||||
|
xfce/xfce4-session-4.14.2-x86_64-2.txz: Rebuilt.
|
||||||
|
Use xfce4-screensaver by default and don't ship the xscreensaver.desktop
|
||||||
|
autostart file. Thanks to Robby Workman.
|
||||||
|
extra/pure-alsa-system/*: Removed.
|
||||||
|
This served a purpose during the pure ALSA to PulseAudio transition, but
|
||||||
|
it's time for it to go away. If the latency is an issue for your use case,
|
||||||
|
a look around should turn up documentation on how to reduce it, or how to
|
||||||
|
send output directly to ALSA without having to uninstall PulseAudio or
|
||||||
|
recompile anything that's linked to it. As an example, see this one (which
|
||||||
|
was mentioned here before):
|
||||||
|
https://wiki.archlinux.org/index.php/PulseAudio/Examples#PulseAudio_as_a_minimal_unintrusive_dumb_pipe_to_ALSA
|
||||||
|
isolinux/initrd.img: Rebuilt.
|
||||||
|
kernels/*: Upgraded.
|
||||||
|
usb-and-pxe-installers/usbboot.img: Rebuilt.
|
||||||
|
</pre>]]>
|
||||||
|
</description>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<title>Wed, 23 Dec 2020 21:21:34 GMT</title>
|
<title>Wed, 23 Dec 2020 21:21:34 GMT</title>
|
||||||
<pubDate>Wed, 23 Dec 2020 21:21:34 GMT</pubDate>
|
<pubDate>Wed, 23 Dec 2020 21:21:34 GMT</pubDate>
|
||||||
|
|
106
ChangeLog.txt
106
ChangeLog.txt
|
@ -1,3 +1,109 @@
|
||||||
|
Fri Dec 25 00:52:08 UTC 2020
|
||||||
|
Here are some updates to provide a little holiday cheer. The kernels are
|
||||||
|
rebuilt (yeah, we'll probably have new ones tomorrow but whatever) to build in
|
||||||
|
HWMON making NVMe temperature monitoring available, and there's also a massive
|
||||||
|
cleanup of polkit/dbus related packages to move most of the config files out
|
||||||
|
of /etc and not install them as .new. Local config files that override the
|
||||||
|
shipped ones may be placed in the directories in /etc to override the ones that
|
||||||
|
we ship. Thanks to Robby Workman for this!
|
||||||
|
None of the packages included in Slackware place any files in
|
||||||
|
/etc/polkit-1/rules.d/ or /etc/dbus-1/system.d/ any more, but there may be
|
||||||
|
third-party packages that still do. However, since Slackware's packages
|
||||||
|
originally installed these as .new files, the leftover configs will remain.
|
||||||
|
You'll probably want to take a look in those directories to clean out any
|
||||||
|
config files that you haven't modified yourself or that belong to packages that
|
||||||
|
aren't part of Slackware itself.
|
||||||
|
Hope everyone has a great day. :-)
|
||||||
|
a/dbus-1.12.20-x86_64-3.txz: Rebuilt.
|
||||||
|
Added local config override directory /etc/dbus-1/system.d/ since no other
|
||||||
|
package provides it now.
|
||||||
|
a/kernel-generic-5.10.2-x86_64-2.txz: Upgraded.
|
||||||
|
a/kernel-huge-5.10.2-x86_64-2.txz: Upgraded.
|
||||||
|
a/kernel-modules-5.10.2-x86_64-2.txz: Upgraded.
|
||||||
|
a/udisks-1.0.5-x86_64-6.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
a/udisks2-2.9.1-x86_64-2.txz: Rebuilt.
|
||||||
|
Include 20-plugdev-group-mount-override.rules, installed in the system
|
||||||
|
location. Thanks to Robby Workman.
|
||||||
|
ap/cups-2.3.3-x86_64-3.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
ap/hplip-3.20.6-x86_64-4.txz: Rebuilt.
|
||||||
|
Use --enable-qt5.
|
||||||
|
Move D-Bus configs from /etc to the system location.
|
||||||
|
Drop HAL support (LOL!)
|
||||||
|
Thanks to Robby Workman.
|
||||||
|
ap/mpg123-1.26.4-x86_64-1.txz: Upgraded.
|
||||||
|
d/gnucobol-3.1.2-x86_64-1.txz: Upgraded.
|
||||||
|
d/kernel-headers-5.10.2-x86-2.txz: Upgraded.
|
||||||
|
k/kernel-source-5.10.2-noarch-2.txz: Upgraded.
|
||||||
|
HWMON m -> y
|
||||||
|
+NVME_HWMON y
|
||||||
|
+POWER_SUPPLY_HWMON y
|
||||||
|
+THERMAL_HWMON y
|
||||||
|
Thanks to Daedra.
|
||||||
|
kde/sddm-0.19.0-x86_64-4.txz: Rebuilt.
|
||||||
|
Don't include the /etc/dbus-1/system.d/ directory.
|
||||||
|
l/GConf-3.2.6-x86_64-5.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
l/accountsservice-0.6.55-x86_64-2.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
l/cryptopp-8.3.0-x86_64-1.txz: Upgraded.
|
||||||
|
l/harfbuzz-2.7.3-x86_64-1.txz: Upgraded.
|
||||||
|
l/polkit-0.118-x86_64-3.txz: Rebuilt.
|
||||||
|
Remove D-Bus rules for udisks2 and NetworkManager (moved to those packages).
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
l/pulseaudio-14.0-x86_64-2.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
l/system-config-printer-1.5.12-x86_64-6.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
n/ModemManager-1.14.8-x86_64-2.txz: Rebuilt.
|
||||||
|
Added elogind support.
|
||||||
|
Move D-Bus configs from /etc to the system location.
|
||||||
|
Thanks to Robby Workman.
|
||||||
|
n/NetworkManager-1.28.0-x86_64-2.txz: Rebuilt.
|
||||||
|
Include 10-org.freedesktop.NetworkManager.rules, installed in the system
|
||||||
|
location. Thanks to Robby Workman.
|
||||||
|
n/bluez-5.55-x86_64-2.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
n/netatalk-3.1.12-x86_64-5.txz: Rebuilt.
|
||||||
|
Patched to fix failure to build from source with gcc10.
|
||||||
|
Move D-Bus configs from /etc to the system location.
|
||||||
|
Thanks to Robby Workman.
|
||||||
|
n/wpa_supplicant-2.9-x86_64-3.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
x/mesa-20.3.1-x86_64-2.txz: Rebuilt.
|
||||||
|
[PATCH] vulkan/device_select: Store Vulkan vendorID and deviceID as uint32_t.
|
||||||
|
Thanks to sasha69 for the link to the upstream discussion/commit.
|
||||||
|
xap/blueman-2.1.4-x86_64-3.txz: Rebuilt.
|
||||||
|
Move D-Bus configs from /etc to the system location. Thanks to Robby Workman.
|
||||||
|
xap/xgames-0.3-x86_64-6.txz: Rebuilt.
|
||||||
|
Fixed spider failing to build from source with gcc10.
|
||||||
|
Removed the ancient version of xsnow.
|
||||||
|
xap/xscreensaver-5.45-x86_64-2.txz: Rebuilt.
|
||||||
|
Make the description of the xscreensaver settings be clearly for xscreensaver
|
||||||
|
as opposed to a generic "screensaver" settings. Thanks to Robby Workman.
|
||||||
|
xap/xsnow-3.1.9-x86_64-1.txz: Added.
|
||||||
|
Merry Christmas / Happy Holidays! :-)
|
||||||
|
xfce/mousepad-0.5.1-x86_64-1.txz: Upgraded.
|
||||||
|
xfce/xfce4-screensaver-0.1.11-x86_64-2.txz: Rebuilt.
|
||||||
|
Make the description of the xfce4-screensaver settings be clearly for
|
||||||
|
xfce4-screensaver as opposed to a generic "screensaver" settings.
|
||||||
|
Thanks to Robby Workman.
|
||||||
|
xfce/xfce4-session-4.14.2-x86_64-2.txz: Rebuilt.
|
||||||
|
Use xfce4-screensaver by default and don't ship the xscreensaver.desktop
|
||||||
|
autostart file. Thanks to Robby Workman.
|
||||||
|
extra/pure-alsa-system/*: Removed.
|
||||||
|
This served a purpose during the pure ALSA to PulseAudio transition, but
|
||||||
|
it's time for it to go away. If the latency is an issue for your use case,
|
||||||
|
a look around should turn up documentation on how to reduce it, or how to
|
||||||
|
send output directly to ALSA without having to uninstall PulseAudio or
|
||||||
|
recompile anything that's linked to it. As an example, see this one (which
|
||||||
|
was mentioned here before):
|
||||||
|
https://wiki.archlinux.org/index.php/PulseAudio/Examples#PulseAudio_as_a_minimal_unintrusive_dumb_pipe_to_ALSA
|
||||||
|
isolinux/initrd.img: Rebuilt.
|
||||||
|
kernels/*: Upgraded.
|
||||||
|
usb-and-pxe-installers/usbboot.img: Rebuilt.
|
||||||
|
+--------------------------+
|
||||||
Wed Dec 23 21:21:34 UTC 2020
|
Wed Dec 23 21:21:34 UTC 2020
|
||||||
a/lilo-24.2-x86_64-10.txz: Rebuilt.
|
a/lilo-24.2-x86_64-10.txz: Rebuilt.
|
||||||
Add -fcommon to fix build with gcc10.
|
Add -fcommon to fix build with gcc10.
|
||||||
|
|
13065
FILELIST.TXT
13065
FILELIST.TXT
File diff suppressed because it is too large
Load diff
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
Slackware initrd mini HOWTO
|
Slackware initrd mini HOWTO
|
||||||
by Patrick Volkerding, volkerdi@slackware.com
|
by Patrick Volkerding, volkerdi@slackware.com
|
||||||
Mon Dec 21 22:11:19 UTC 2020
|
Fri Dec 25 00:29:32 UTC 2020
|
||||||
|
|
||||||
This document describes how to create and install an initrd, which may be
|
This document describes how to create and install an initrd, which may be
|
||||||
required to use the 4.x kernel. Also see "man mkinitrd".
|
required to use the 4.x kernel. Also see "man mkinitrd".
|
||||||
|
@ -40,9 +40,9 @@ First, make sure the kernel, kernel modules, and mkinitrd package are
|
||||||
installed (the current version numbers might be a little different, so
|
installed (the current version numbers might be a little different, so
|
||||||
this is just an example):
|
this is just an example):
|
||||||
|
|
||||||
installpkg kernel-generic-5.10.2-x86_64-1.txz
|
installpkg kernel-generic-5.10.2-x86_64-2.txz
|
||||||
installpkg kernel-modules-5.10.2-x86_64-1.txz
|
installpkg kernel-modules-5.10.2-x86_64-2.txz
|
||||||
installpkg mkinitrd-1.4.11-x86_64-15.txz
|
installpkg mkinitrd-1.4.11-x86_64-16.txz
|
||||||
|
|
||||||
Change into the /boot directory:
|
Change into the /boot directory:
|
||||||
|
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
# Don't like PulseAudio?
|
|
||||||
# Fine, we're not going to force you to use it.
|
|
||||||
#
|
|
||||||
# To eliminate PulseAudio from your system and switch to using pure ALSA,
|
|
||||||
# first remove the following packages:
|
|
||||||
|
|
||||||
removepkg --terse pulseaudio pamixer pavucontrol xfce4-pulseaudio-plugin
|
|
||||||
|
|
||||||
# Next, install the packages in this directory:
|
|
||||||
|
|
||||||
upgradepkg --install-new --terse *.txz
|
|
||||||
|
|
||||||
# Move the new asound.conf into place:
|
|
||||||
|
|
||||||
echo "Moving /etc/asound.conf.new to /etc/asound.conf:"
|
|
||||||
mv --verbose /etc/asound.conf.new /etc/asound.conf
|
|
||||||
|
|
||||||
# Make rc.alsa executable so that volume is properly restored:
|
|
||||||
echo "Making /etc/rc.d/rc.alsa executable."
|
|
||||||
chmod 755 /etc/rc.d/rc.alsa
|
|
||||||
|
|
||||||
# You may need to reboot at this point to make sure there are no running
|
|
||||||
# PulseAudio processes, or any binaries still mapping the PulseAudio libraries.
|
|
||||||
# If you use Xfce, you'll probably want to add the xfce4-mixer plugin (named
|
|
||||||
# "audio mixer" in the menu) to the panel.
|
|
||||||
#
|
|
||||||
# If you run this README file as a script, it will do all of these things for
|
|
||||||
# you except for adding the audio mixer to the Xfce panel:
|
|
||||||
#
|
|
||||||
# sh README
|
|
||||||
#
|
|
||||||
# Caveats:
|
|
||||||
# Bluetooth audio will no longer work.
|
|
||||||
# Third party packages that link to PulseAudio will need to be rebuilt.
|
|
||||||
#
|
|
||||||
# Enjoy! :-)
|
|
|
@ -1,17 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# This script should be run in the current directory if you wish to uninstall
|
|
||||||
# the pure ALSA packages and switch back to using Pulseaudio.
|
|
||||||
|
|
||||||
removepkg --terse xfce4-mixer xfce4-volumed
|
|
||||||
for package in MPlayer alsa-lib alsa-plugins audacious-plugins ffmpeg \
|
|
||||||
fluidsynth gst-plugins-good gst-plugins-good0 kde-runtime kmix libao \
|
|
||||||
pulseaudio pamixer pavucontrol qt5 xfce4-pulseaudio-plugin \
|
|
||||||
libcanberra mpg123 phonon sox xine-lib ; do
|
|
||||||
upgradepkg --install-new --terse ../../slackware*/*/${package}-*.txz
|
|
||||||
done
|
|
||||||
echo "Moving /etc/asound.conf.new to /etc/asound.conf:"
|
|
||||||
mv --verbose /etc/asound.conf.new /etc/asound.conf
|
|
||||||
echo "Making /etc/rc.d/rc.alsa non-executable."
|
|
||||||
chmod 644 /etc/rc.d/rc.alsa
|
|
||||||
echo "System is converted back to using Pulseaudio."
|
|
|
@ -1,34 +0,0 @@
|
||||||
# Before running this buildlist, remove the following packages:
|
|
||||||
# removepkg pulseaudio pamixer pavucontrol xfce4-pulseaudio-plugin
|
|
||||||
#
|
|
||||||
# Then, build/install the ALSA-only packages with these commands:
|
|
||||||
# cd ../../../source
|
|
||||||
# BUILDLIST=../extra/source/pure-alsa-system/pure-alsa-system.buildlist ./make_world.sh
|
|
||||||
#
|
|
||||||
# After the build/install is complete, move the asound.conf.new into place:
|
|
||||||
# mv /etc/asound.conf.new /etc/asound.conf
|
|
||||||
#
|
|
||||||
# If you use Xfce, add the audio mixer plugin to your panel.
|
|
||||||
#
|
|
||||||
# A reboot might be needed to release the pulseaudio processes/libraries.
|
|
||||||
#
|
|
||||||
# Enjoy! :-)
|
|
||||||
#
|
|
||||||
l/alsa-lib/alsa-lib.SlackBuild
|
|
||||||
l/libao/libao.SlackBuild
|
|
||||||
l/libcanberra/libcanberra.SlackBuild
|
|
||||||
l/fluidsynth/fluidsynth.SlackBuild
|
|
||||||
l/gst-plugins-good0/gst-plugins-good0.SlackBuild
|
|
||||||
l/gst-plugins-good/gst-plugins-good.SlackBuild
|
|
||||||
l/alsa-plugins/alsa-plugins.SlackBuild
|
|
||||||
xap/audacious-plugins/audacious-plugins.SlackBuild
|
|
||||||
l/ffmpeg/ffmpeg.SlackBuild
|
|
||||||
l/phonon/phonon.SlackBuild
|
|
||||||
xap/xine-lib/xine-lib.SlackBuild
|
|
||||||
ap/sox/sox.SlackBuild
|
|
||||||
ap/mpg123/mpg123.SlackBuild
|
|
||||||
xap/MPlayer/MPlayer.SlackBuild
|
|
||||||
kde/kde.SlackBuild kdebase:kde-runtime
|
|
||||||
kde/kde.SlackBuild kdemultimedia:kmix
|
|
||||||
../extra/source/pure-alsa-system/xfce4-mixer/xfce4-mixer.SlackBuild
|
|
||||||
../extra/source/pure-alsa-system/xfce4-volumed/xfce4-volumed.SlackBuild
|
|
|
@ -1,87 +0,0 @@
|
||||||
From 7a18841c988edb593127842ec5c919df537f9ce0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andrzej <ndrwrdck@gmail.com>
|
|
||||||
Date: Sat, 12 Apr 2014 08:53:09 +0100
|
|
||||||
Subject: [PATCH] Make Unique support optional
|
|
||||||
|
|
||||||
---
|
|
||||||
configure.ac.in | 4 +++-
|
|
||||||
xfce4-mixer/main.c | 21 +++++++++++++++++++++
|
|
||||||
2 files changed, 24 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- ./configure.ac.in.orig 2014-04-09 14:44:50.000000000 -0500
|
|
||||||
+++ ./configure.ac.in 2018-04-24 12:36:10.442764602 -0500
|
|
||||||
@@ -98,7 +98,6 @@
|
|
||||||
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
|
|
||||||
XDT_CHECK_PACKAGE([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10], [0.10.25])
|
|
||||||
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0])
|
|
||||||
-XDT_CHECK_PACKAGE([UNIQUE], [unique-1.0], [1.1])
|
|
||||||
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
|
|
||||||
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
|
|
||||||
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0])
|
|
||||||
--- ./xfce4-mixer/main.c.orig 2014-04-09 14:44:50.000000000 -0500
|
|
||||||
+++ ./xfce4-mixer/main.c 2018-04-24 12:35:56.340763434 -0500
|
|
||||||
@@ -30,7 +30,10 @@
|
|
||||||
#include <gst/gst.h>
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
+
|
|
||||||
+#ifdef HAVE_UNIQUE
|
|
||||||
#include <unique/unique.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include <libxfce4util/libxfce4util.h>
|
|
||||||
#include <libxfce4ui/libxfce4ui.h>
|
|
||||||
@@ -42,6 +45,7 @@
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
+#ifdef HAVE_UNIQUE
|
|
||||||
static UniqueResponse
|
|
||||||
message_received (UniqueApp *app,
|
|
||||||
UniqueCommand command,
|
|
||||||
@@ -68,6 +72,7 @@
|
|
||||||
|
|
||||||
return response;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -75,7 +80,9 @@
|
|
||||||
main (int argc,
|
|
||||||
char **argv)
|
|
||||||
{
|
|
||||||
+#ifdef HAVE_UNIQUE
|
|
||||||
UniqueApp *app;
|
|
||||||
+#endif
|
|
||||||
GtkWidget *window;
|
|
||||||
GError *error = NULL;
|
|
||||||
gboolean debug_mode = FALSE;
|
|
||||||
@@ -162,6 +169,7 @@
|
|
||||||
if (debug_mode)
|
|
||||||
xfce_mixer_dump_gst_data ();
|
|
||||||
|
|
||||||
+#ifdef HAVE_UNIQUE
|
|
||||||
/* Create unique application */
|
|
||||||
app = unique_app_new ("org.xfce.xfce4-mixer", NULL);
|
|
||||||
if (unique_app_is_running (app))
|
|
||||||
@@ -192,6 +200,19 @@
|
|
||||||
/* Destroy the window */
|
|
||||||
gtk_widget_destroy (window);
|
|
||||||
}
|
|
||||||
+#else
|
|
||||||
+ /* Create the mixer window */
|
|
||||||
+ window = xfce_mixer_window_new ();
|
|
||||||
+
|
|
||||||
+ /* Display the mixer window */
|
|
||||||
+ gtk_widget_show (window);
|
|
||||||
+
|
|
||||||
+ /* Enter the GTK+ main loop */
|
|
||||||
+ gtk_main ();
|
|
||||||
+
|
|
||||||
+ /* Destroy the window */
|
|
||||||
+ gtk_widget_destroy (window);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
/* Shutdown the mixer library */
|
|
||||||
xfce_mixer_shutdown ();
|
|
|
@ -1,63 +0,0 @@
|
||||||
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
|
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
From 735927c7a72b69f60f13fe7bcf4a10c1a80ca151 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Robby Workman <rworkman@slackware.com>
|
|
||||||
Date: Thu, 19 Feb 2015 19:07:06 -0600
|
|
||||||
Subject: [PATCH] icons/Makefile.am: Remove unnecessary gtk-update-icon-cache
|
|
||||||
|
|
||||||
No icons are installed in the standard paths any more, so this
|
|
||||||
appears to be leftover code.
|
|
||||||
---
|
|
||||||
icons/Makefile.am | 13 -------------
|
|
||||||
1 file changed, 13 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/icons/Makefile.am b/icons/Makefile.am
|
|
||||||
index 70638c1..035476a 100644
|
|
||||||
--- a/icons/Makefile.am
|
|
||||||
+++ b/icons/Makefile.am
|
|
||||||
@@ -4,17 +4,4 @@ SUBDIRS = \
|
|
||||||
16x16 \
|
|
||||||
scalable
|
|
||||||
|
|
||||||
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
|
|
||||||
-
|
|
||||||
-install-data-hook:
|
|
||||||
- @-if test -z "$(DESTDIR)"; then \
|
|
||||||
- echo "Updating Gtk icon cache."; \
|
|
||||||
- $(gtk_update_icon_cache); \
|
|
||||||
- else \
|
|
||||||
- echo "*** Icon cache not updated. Remember to run:"; \
|
|
||||||
- echo "***"; \
|
|
||||||
- echo "*** $(gtk_update_icon_cache)"; \
|
|
||||||
- echo "***"; \
|
|
||||||
- fi
|
|
||||||
-
|
|
||||||
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
|
|
||||||
--
|
|
||||||
2.3.1
|
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
This package is only useful on a pure ALSA system, and so it is not built
|
|
||||||
by default. For information about removing PulseAudio and switching to
|
|
||||||
pure ALSA (this is not generally recommended, but some use-cases demand it),
|
|
||||||
please see the files in ../../l/alsa-lib.
|
|
|
@ -1,14 +0,0 @@
|
||||||
if [ -x /usr/bin/update-desktop-database ]; then
|
|
||||||
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -x /usr/bin/update-mime-database ]; then
|
|
||||||
/usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
|
|
||||||
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
|
||||||
/usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
# 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 ':'.
|
|
||||||
|
|
||||||
|-----handy-ruler------------------------------------------------------|
|
|
||||||
xfce4-mixer: xfce4-mixer (Sound mixer applet for Xfce)
|
|
||||||
xfce4-mixer:
|
|
||||||
xfce4-mixer: The xfce4-mixer package contains a volume control application based
|
|
||||||
xfce4-mixer: on GStreamer written to conceptually fit into the Xfce desktop
|
|
||||||
xfce4-mixer: environment. It also contains a plugin for the Xfce panel which is
|
|
||||||
xfce4-mixer: especially designed for use with the mouse wheel.
|
|
||||||
xfce4-mixer:
|
|
||||||
xfce4-mixer:
|
|
||||||
xfce4-mixer:
|
|
||||||
xfce4-mixer:
|
|
||||||
xfce4-mixer:
|
|
|
@ -1,37 +0,0 @@
|
||||||
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
|
|
||||||
|
|
|
@ -1,80 +0,0 @@
|
||||||
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
|
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
# 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 ':'.
|
|
||||||
|
|
||||||
|-----handy-ruler------------------------------------------------------|
|
|
||||||
xfce4-volumed: xfce4-volumed (audio volume management daemon)
|
|
||||||
xfce4-volumed:
|
|
||||||
xfce4-volumed: This daemon is responsible for making the volume up/down and mute
|
|
||||||
xfce4-volumed: keys of the keyboard work automatically, and uses the XFCE mixer's
|
|
||||||
xfce4-volumed: defined card and track for choosing which track to act on.
|
|
||||||
xfce4-volumed:
|
|
||||||
xfce4-volumed: It also provides volume change and mute toggle notifications if
|
|
||||||
xfce4-volumed: a notification daemon is running (using libnotify).
|
|
||||||
xfce4-volumed:
|
|
||||||
xfce4-volumed: Homepage: https://launchpad.net/xfce4-volumed
|
|
||||||
xfce4-volumed:
|
|
|
@ -1,117 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Slackware build script for xfce4-volumed
|
|
||||||
|
|
||||||
# Copyright 2006-2011 Robby Workman Northport, Alabama, USA
|
|
||||||
# Copyright 2009, 2018 Patrick J. Volkerding, Sebeka, MN, USA
|
|
||||||
# All rights reserved.
|
|
||||||
#
|
|
||||||
# Redistribution and use of this script, with or without modification, is
|
|
||||||
# permitted provided that the following conditions are met:
|
|
||||||
#
|
|
||||||
# 1. Redistributions of this script must retain the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
|
||||||
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
||||||
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
|
||||||
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
||||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
|
||||||
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
|
||||||
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
|
||||||
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
|
||||||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
cd $(dirname $0) ; CWD=$(pwd)
|
|
||||||
|
|
||||||
PKGNAM=xfce4-volumed
|
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
|
||||||
BUILD=${BUILD:-4_alsa}
|
|
||||||
|
|
||||||
if [ -z "$ARCH" ]; then
|
|
||||||
case "$( uname -m )" in
|
|
||||||
i?86) ARCH=i586 ;;
|
|
||||||
arm*) ARCH=arm ;;
|
|
||||||
# Unless $ARCH is already set, use uname -m for all other archs:
|
|
||||||
*) ARCH=$( uname -m ) ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
NUMJOBS=${NUMJOBS:-" -j7 "}
|
|
||||||
|
|
||||||
TMP=${TMP:-/tmp}
|
|
||||||
PKG=$TMP/package-$PKGNAM
|
|
||||||
|
|
||||||
if [ "$ARCH" = "i586" ]; then
|
|
||||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
|
||||||
LIBDIRSUFFIX=""
|
|
||||||
elif [ "$ARCH" = "i686" ]; then
|
|
||||||
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
|
|
||||||
LIBDIRSUFFIX=""
|
|
||||||
elif [ "$ARCH" = "x86_64" ]; then
|
|
||||||
SLKCFLAGS="-O2 -fPIC"
|
|
||||||
LIBDIRSUFFIX="64"
|
|
||||||
else
|
|
||||||
SLKCFLAGS="-O2"
|
|
||||||
LIBDIRSUFFIX=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
|
||||||
# the name of the created package would be, and then exit. This information
|
|
||||||
# could be useful to other scripts.
|
|
||||||
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
|
||||||
echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
rm -rf $PKG
|
|
||||||
mkdir -p $TMP $PKG
|
|
||||||
cd $TMP
|
|
||||||
rm -rf $PKGNAM-$VERSION
|
|
||||||
tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
|
|
||||||
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 \
|
|
||||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
|
||||||
-exec chmod 644 {} \+
|
|
||||||
|
|
||||||
zcat $CWD/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch | patch -p1 --verbose || exit 1
|
|
||||||
zcat $CWD/0003-Removing-edge-case-memleaks.patch | patch -p1 --verbose || exit 1
|
|
||||||
|
|
||||||
CFLAGS="$SLKCFLAGS" \
|
|
||||||
./configure \
|
|
||||||
--prefix=/usr \
|
|
||||||
--libdir=/usr/lib${LIBDIRSUFFIX} \
|
|
||||||
--sysconfdir=/etc \
|
|
||||||
--mandir=/usr/man \
|
|
||||||
--docdir=/usr/doc/$PKGNAM-$VERSION \
|
|
||||||
--enable-debug=no \
|
|
||||||
--build=$ARCH-slackware-linux || exit 1
|
|
||||||
|
|
||||||
make $NUMJOBS || make || exit 1
|
|
||||||
make install DESTDIR=$PKG || exit 1
|
|
||||||
|
|
||||||
find $PKG | xargs file | grep -e "executable" -e "shared object" \
|
|
||||||
| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
|
|
||||||
|
|
||||||
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
|
|
||||||
cp -a \
|
|
||||||
AUTHORS COPYING* INSTALL 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
|
|
||||||
|
|
||||||
cd $PKG
|
|
||||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
|
|
@ -9,12 +9,6 @@ gzip ./extra/source/xv/xv.prefix_x86_64.diff
|
||||||
gzip ./extra/source/xv/xv.jasper.diff
|
gzip ./extra/source/xv/xv.jasper.diff
|
||||||
gzip ./extra/source/xv/xv.prefix.diff
|
gzip ./extra/source/xv/xv.prefix.diff
|
||||||
gzip ./extra/source/getty-ps/getty.bugfixes.diff
|
gzip ./extra/source/getty-ps/getty.bugfixes.diff
|
||||||
gzip ./extra/source/pure-alsa-system/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch
|
|
||||||
gzip ./extra/source/pure-alsa-system/xfce4-volumed/0003-Removing-edge-case-memleaks.patch
|
|
||||||
gzip ./extra/source/pure-alsa-system/xfce4-mixer/0001-Make-Unique-support-optional.patch
|
|
||||||
gzip ./extra/source/pure-alsa-system/xfce4-mixer/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch
|
|
||||||
gzip ./extra/source/pure-alsa-system/xfce4-mixer/doinst.sh
|
|
||||||
gzip ./extra/source/pure-alsa-system/xfce4-mixer/0001-icons-Makefile.am-Remove-unnecessary-gtk-update-icon.patch
|
|
||||||
gzip ./extra/source/recordmydesktop/recordmydesktop-bitrate.patch
|
gzip ./extra/source/recordmydesktop/recordmydesktop-bitrate.patch
|
||||||
gzip ./extra/source/recordmydesktop/shmstr-to-shmproto.patch
|
gzip ./extra/source/recordmydesktop/shmstr-to-shmproto.patch
|
||||||
gzip ./extra/source/fltk/fltk.fltk-config.in.diff
|
gzip ./extra/source/fltk/fltk.fltk-config.in.diff
|
||||||
|
@ -596,11 +590,14 @@ gzip ./source/n/dnsmasq/dnsmasq.libidn2.diff
|
||||||
gzip ./source/n/cyrus-sasl/rc.saslauthd
|
gzip ./source/n/cyrus-sasl/rc.saslauthd
|
||||||
gzip ./source/n/cyrus-sasl/doinst.sh
|
gzip ./source/n/cyrus-sasl/doinst.sh
|
||||||
gzip ./source/n/netatalk/doinst.sh
|
gzip ./source/n/netatalk/doinst.sh
|
||||||
|
gzip ./source/n/netatalk/netatalk-invalid_dircache_entries.patch
|
||||||
gzip ./source/xfce/xfce4-whiskermenu-plugin/doinst.sh
|
gzip ./source/xfce/xfce4-whiskermenu-plugin/doinst.sh
|
||||||
gzip ./source/xfce/xfce4-power-manager/doinst.sh
|
gzip ./source/xfce/xfce4-power-manager/doinst.sh
|
||||||
gzip ./source/xfce/xfce4-taskmanager/doinst.sh
|
gzip ./source/xfce/xfce4-taskmanager/doinst.sh
|
||||||
gzip ./source/xfce/mousepad/doinst.sh
|
gzip ./source/xfce/mousepad/doinst.sh
|
||||||
gzip ./source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch
|
gzip ./source/xfce/xfce4-screensaver/0001-Catch-gs_listener_dbus_init-failures.patch
|
||||||
|
gzip ./source/xfce/xfce4-screensaver/clarify-desc-in-xfce-settings.patch
|
||||||
|
gzip ./source/xfce/xfce4-session/use-xfss-by-default-in-xfce.patch
|
||||||
gzip ./source/xfce/elementary-xfce/doinst.sh
|
gzip ./source/xfce/elementary-xfce/doinst.sh
|
||||||
gzip ./source/xfce/xfce4-panel/libxfce4panel.max_blinking_count.8.diff
|
gzip ./source/xfce/xfce4-panel/libxfce4panel.max_blinking_count.8.diff
|
||||||
gzip ./source/xfce/xfce4-panel-profiles/doinst.sh
|
gzip ./source/xfce/xfce4-panel-profiles/doinst.sh
|
||||||
|
@ -975,6 +972,7 @@ gzip ./source/xap/xgames/xlander-2009-07-18.diff
|
||||||
gzip ./source/xap/xgames/xcuckoo.diff
|
gzip ./source/xap/xgames/xcuckoo.diff
|
||||||
gzip ./source/xap/xgames/xcolormap.diff
|
gzip ./source/xap/xgames/xcolormap.diff
|
||||||
gzip ./source/xap/xgames/spider.diff
|
gzip ./source/xap/xgames/spider.diff
|
||||||
|
gzip ./source/xap/xgames/spider.gcc10.diff
|
||||||
gzip ./source/xap/seamonkey/autoconf/autoconf-2.13-consolidated_fixes-1.patch
|
gzip ./source/xap/seamonkey/autoconf/autoconf-2.13-consolidated_fixes-1.patch
|
||||||
gzip ./source/xap/seamonkey/doinst.sh
|
gzip ./source/xap/seamonkey/doinst.sh
|
||||||
gzip ./source/xap/seamonkey/sm.ui.scrollToClick.diff
|
gzip ./source/xap/seamonkey/sm.ui.scrollToClick.diff
|
||||||
|
@ -1032,6 +1030,7 @@ gzip ./source/xap/geeqie/doinst.sh
|
||||||
gzip ./source/xap/geeqie/fix-build-re-docs.diff
|
gzip ./source/xap/geeqie/fix-build-re-docs.diff
|
||||||
gzip ./source/xap/audacious/doinst.sh
|
gzip ./source/xap/audacious/doinst.sh
|
||||||
gzip ./source/xap/xscreensaver/setuid.c
|
gzip ./source/xap/xscreensaver/setuid.c
|
||||||
|
gzip ./source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch
|
||||||
gzip ./source/xap/xscreensaver/xscreensaver.electricsheep.diff
|
gzip ./source/xap/xscreensaver/xscreensaver.electricsheep.diff
|
||||||
gzip ./source/xap/xscreensaver/doinst.sh
|
gzip ./source/xap/xscreensaver/doinst.sh
|
||||||
gzip ./source/xap/xscreensaver/xscreensaver.setuid.diff
|
gzip ./source/xap/xscreensaver/xscreensaver.setuid.diff
|
||||||
|
|
|
@ -60,12 +60,13 @@ Press ENTER when you are done." \
|
||||||
"xpdf" "Portable Document Format (PDF) viewer" "on" \
|
"xpdf" "Portable Document Format (PDF) viewer" "on" \
|
||||||
"xsane" "X interface to Scanner Access Now Easy" "on" \
|
"xsane" "X interface to Scanner Access Now Easy" "on" \
|
||||||
"xscreensaver" "A screen saver and locker for X" "on" \
|
"xscreensaver" "A screen saver and locker for X" "on" \
|
||||||
|
"xsnow" "let it snow on your desktop" "on" \
|
||||||
2> $TMP/SeTpkgs
|
2> $TMP/SeTpkgs
|
||||||
if [ $? = 1 -o $? = 255 ]; then
|
if [ $? = 1 -o $? = 255 ]; then
|
||||||
rm -f $TMP/SeTpkgs
|
rm -f $TMP/SeTpkgs
|
||||||
> $TMP/SeTnewtag
|
> $TMP/SeTnewtag
|
||||||
for pkg in \
|
for pkg in \
|
||||||
MPlayer NetworkManager-openvpn audacious audacious-plugins blackbox blueman ddd easytag electricsheep ffmpegthumbnailer fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gparted gucharmap gv hexchat libnma mozilla-firefox mozilla-thunderbird network-manager-applet pan pavucontrol pidgin rdesktop rxvt-unicode sane seamonkey seyon ssr vim-gvim windowmaker x11-ssh-askpass x3270 xaos xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver \
|
MPlayer NetworkManager-openvpn audacious audacious-plugins blackbox blueman ddd easytag electricsheep ffmpegthumbnailer fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gparted gucharmap gv hexchat libnma mozilla-firefox mozilla-thunderbird network-manager-applet pan pavucontrol pidgin rdesktop rxvt-unicode sane seamonkey seyon ssr vim-gvim windowmaker x11-ssh-askpass x3270 xaos xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xsnow \
|
||||||
; do
|
; do
|
||||||
echo "$pkg: SKP" >> $TMP/SeTnewtag
|
echo "$pkg: SKP" >> $TMP/SeTnewtag
|
||||||
done
|
done
|
||||||
|
@ -73,7 +74,7 @@ MPlayer NetworkManager-openvpn audacious audacious-plugins blackbox blueman ddd
|
||||||
fi
|
fi
|
||||||
cat /dev/null > $TMP/SeTnewtag
|
cat /dev/null > $TMP/SeTnewtag
|
||||||
for PACKAGE in \
|
for PACKAGE in \
|
||||||
MPlayer NetworkManager-openvpn audacious audacious-plugins blackbox blueman ddd easytag electricsheep ffmpegthumbnailer fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gparted gucharmap gv hexchat libnma mozilla-firefox mozilla-thunderbird network-manager-applet pan pavucontrol pidgin rdesktop rxvt-unicode sane seamonkey seyon ssr vim-gvim windowmaker x11-ssh-askpass x3270 xaos xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver \
|
MPlayer NetworkManager-openvpn audacious audacious-plugins blackbox blueman ddd easytag electricsheep ffmpegthumbnailer fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gparted gucharmap gv hexchat libnma mozilla-firefox mozilla-thunderbird network-manager-applet pan pavucontrol pidgin rdesktop rxvt-unicode sane seamonkey seyon ssr vim-gvim windowmaker x11-ssh-askpass x3270 xaos xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xsnow \
|
||||||
; do
|
; do
|
||||||
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
|
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
|
||||||
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
|
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
|
||||||
|
|
|
@ -60,12 +60,13 @@ Press ENTER when you are done." \
|
||||||
"xpdf" "Portable Document Format (PDF) viewer" "on" \
|
"xpdf" "Portable Document Format (PDF) viewer" "on" \
|
||||||
"xsane" "X interface to Scanner Access Now Easy" "on" \
|
"xsane" "X interface to Scanner Access Now Easy" "on" \
|
||||||
"xscreensaver" "A screen saver and locker for X" "on" \
|
"xscreensaver" "A screen saver and locker for X" "on" \
|
||||||
|
"xsnow" "let it snow on your desktop" "on" \
|
||||||
2> $TMP/SeTpkgs
|
2> $TMP/SeTpkgs
|
||||||
if [ $? = 1 -o $? = 255 ]; then
|
if [ $? = 1 -o $? = 255 ]; then
|
||||||
rm -f $TMP/SeTpkgs
|
rm -f $TMP/SeTpkgs
|
||||||
> $TMP/SeTnewtag
|
> $TMP/SeTnewtag
|
||||||
for pkg in \
|
for pkg in \
|
||||||
MPlayer NetworkManager-openvpn audacious audacious-plugins blackbox blueman ddd easytag electricsheep ffmpegthumbnailer fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gparted gucharmap gv hexchat libnma mozilla-firefox mozilla-thunderbird network-manager-applet pan pavucontrol pidgin rdesktop rxvt-unicode sane seamonkey seyon ssr vim-gvim windowmaker x11-ssh-askpass x3270 xaos xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver \
|
MPlayer NetworkManager-openvpn audacious audacious-plugins blackbox blueman ddd easytag electricsheep ffmpegthumbnailer fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gparted gucharmap gv hexchat libnma mozilla-firefox mozilla-thunderbird network-manager-applet pan pavucontrol pidgin rdesktop rxvt-unicode sane seamonkey seyon ssr vim-gvim windowmaker x11-ssh-askpass x3270 xaos xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xsnow \
|
||||||
; do
|
; do
|
||||||
echo "$pkg: SKP" >> $TMP/SeTnewtag
|
echo "$pkg: SKP" >> $TMP/SeTnewtag
|
||||||
done
|
done
|
||||||
|
@ -73,7 +74,7 @@ MPlayer NetworkManager-openvpn audacious audacious-plugins blackbox blueman ddd
|
||||||
fi
|
fi
|
||||||
cat /dev/null > $TMP/SeTnewtag
|
cat /dev/null > $TMP/SeTnewtag
|
||||||
for PACKAGE in \
|
for PACKAGE in \
|
||||||
MPlayer NetworkManager-openvpn audacious audacious-plugins blackbox blueman ddd easytag electricsheep ffmpegthumbnailer fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gparted gucharmap gv hexchat libnma mozilla-firefox mozilla-thunderbird network-manager-applet pan pavucontrol pidgin rdesktop rxvt-unicode sane seamonkey seyon ssr vim-gvim windowmaker x11-ssh-askpass x3270 xaos xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver \
|
MPlayer NetworkManager-openvpn audacious audacious-plugins blackbox blueman ddd easytag electricsheep ffmpegthumbnailer fluxbox fvwm geeqie gftp gimp gkrellm gnuchess gnuplot gparted gucharmap gv hexchat libnma mozilla-firefox mozilla-thunderbird network-manager-applet pan pavucontrol pidgin rdesktop rxvt-unicode sane seamonkey seyon ssr vim-gvim windowmaker x11-ssh-askpass x3270 xaos xgames xine-lib xine-ui xlockmore xmms xpaint xpdf xsane xscreensaver xsnow \
|
||||||
; do
|
; do
|
||||||
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
|
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
|
||||||
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
|
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
|
||||||
|
|
|
@ -47,3 +47,4 @@ xpaint:OPT
|
||||||
xpdf:OPT
|
xpdf:OPT
|
||||||
xsane:OPT
|
xsane:OPT
|
||||||
xscreensaver:REC
|
xscreensaver:REC
|
||||||
|
xsnow:REC
|
||||||
|
|
|
@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=dbus
|
PKGNAM=dbus
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
|
||||||
BUILD=${BUILD:-2}
|
BUILD=${BUILD:-3}
|
||||||
|
|
||||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||||
|
|
||||||
|
@ -141,6 +141,10 @@ chmod 0755 $PKG/etc/rc.d/rc.messagebus.new
|
||||||
# Fix some directory ownership
|
# Fix some directory ownership
|
||||||
chown messagebus $PKG/var/lib/dbus
|
chown messagebus $PKG/var/lib/dbus
|
||||||
|
|
||||||
|
# Create the local override directory since no other package will include it
|
||||||
|
# now that config files have been moved to the system location under /usr:
|
||||||
|
mkdir -p $PKG/etc/dbus-1/system.d
|
||||||
|
|
||||||
# Add documentation
|
# Add documentation
|
||||||
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
|
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
|
||||||
cp -a \
|
cp -a \
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
# Slackware build script for udisks
|
# Slackware build script for udisks
|
||||||
|
|
||||||
# Copyright 2010, 2011, 2014, 2015 Robby Workman, Northport, Alabama, USA
|
# Copyright 2010, 2011, 2014, 2015, 2020 Robby Workman, Tuscaloosa, Alabama, USA
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use of this script, with or without modification, is
|
# Redistribution and use of this script, with or without modification, is
|
||||||
|
@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=udisks
|
PKGNAM=udisks
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-5}
|
BUILD=${BUILD:-6}
|
||||||
|
|
||||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||||
|
|
||||||
|
@ -117,6 +117,11 @@ mv $PKG/etc/profile.d/udisks-bash-completion.sh \
|
||||||
$PKG/usr/share/bash-completion/completions/udisks
|
$PKG/usr/share/bash-completion/completions/udisks
|
||||||
rmdir --parents $PKG/etc/profile.d
|
rmdir --parents $PKG/etc/profile.d
|
||||||
|
|
||||||
|
# Move the dbus config file to the system directory
|
||||||
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
|
|
||||||
find $PKG/usr/man -type f -exec gzip -9 {} \+
|
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
|
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
PKGNAM=udisks2
|
PKGNAM=udisks2
|
||||||
SRCNAM=udisks
|
SRCNAM=udisks
|
||||||
VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -119,6 +119,10 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
||||||
# Don't overwrite config file, but leave mount_options.conf.example alone
|
# Don't overwrite config file, but leave mount_options.conf.example alone
|
||||||
mv $PKG/etc/udisks2/udisks2.conf $PKG/etc/udisks2/udisks2.conf.new
|
mv $PKG/etc/udisks2/udisks2.conf $PKG/etc/udisks2/udisks2.conf.new
|
||||||
|
|
||||||
|
# Add default policy files for udisks2 events:
|
||||||
|
mkdir -p $PKG/usr/share/polkit-1/rules.d/
|
||||||
|
cat $CWD/20-plugdev-group-mount-override.rules > $PKG/usr/share/polkit-1/rules.d/20-plugdev-group-mount-override.rules
|
||||||
|
|
||||||
# Strip binaries:
|
# Strip binaries:
|
||||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=cups
|
PKGNAM=cups
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.?z | cut -f 2 -d -)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*-source.tar.?z | cut -f 2 -d -)}
|
||||||
BUILD=${BUILD:-2}
|
BUILD=${BUILD:-3}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -146,11 +146,10 @@ chmod 644 $PKG/etc/rc.d/rc.cups.new
|
||||||
# Clear out the additions:
|
# Clear out the additions:
|
||||||
rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d
|
rm -rf $PKG/etc/init.d $PKG/etc/rc{0,2,3,5}.d
|
||||||
|
|
||||||
# I'm not sure if overwriting this blindly could have ill effects,
|
# Move the dbus config file to the system directory
|
||||||
# but it never hurts to play it safe. According to the dbus-daemon
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
# manpage, only files ending in .conf will be used, so there won't
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
# be any unintended doubling up.
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
mv $PKG/etc/dbus-1/system.d/cups.conf $PKG/etc/dbus-1/system.d/cups.conf.new
|
|
||||||
|
|
||||||
# For full CUPS SMB support, you'll need to install the cups-samba
|
# For full CUPS SMB support, you'll need to install the cups-samba
|
||||||
# package from the source in this directory. There's no easy way
|
# package from the source in this directory. There's no easy way
|
||||||
|
|
|
@ -12,7 +12,7 @@ config() {
|
||||||
for file in etc/cups/*.new ; do
|
for file in etc/cups/*.new ; do
|
||||||
config $file
|
config $file
|
||||||
done
|
done
|
||||||
config etc/dbus-1/system.d/cups.conf.new
|
|
||||||
if [ -r etc/pam.d/cups.new ]; then
|
if [ -r etc/pam.d/cups.new ]; then
|
||||||
config etc/pam.d/cups.new
|
config etc/pam.d/cups.new
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=hplip
|
PKGNAM=hplip
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-3}
|
BUILD=${BUILD:-4}
|
||||||
|
|
||||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||||
|
|
||||||
|
@ -150,7 +150,7 @@ PYTHON=/usr/bin/python3 \
|
||||||
--disable-foomatic-ppd-install \
|
--disable-foomatic-ppd-install \
|
||||||
--enable-foomatic-drv-install \
|
--enable-foomatic-drv-install \
|
||||||
--enable-network-build=yes \
|
--enable-network-build=yes \
|
||||||
--enable-qt4 \
|
--enable-qt5 \
|
||||||
--enable-policykit \
|
--enable-policykit \
|
||||||
--enable-cups-ppd-install \
|
--enable-cups-ppd-install \
|
||||||
--build=$ARCH-slackware-linux \
|
--build=$ARCH-slackware-linux \
|
||||||
|
@ -160,6 +160,11 @@ PYTHON=/usr/bin/python3 \
|
||||||
make $NUMJOBS || make || exit 1
|
make $NUMJOBS || make || exit 1
|
||||||
make install DESTDIR=$PKG rulesdir=/lib/udev/rules.d || exit 1
|
make install DESTDIR=$PKG rulesdir=/lib/udev/rules.d || exit 1
|
||||||
|
|
||||||
|
# Move dbus configs to system location:
|
||||||
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
|
|
||||||
# Don't ship .la files:
|
# Don't ship .la files:
|
||||||
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
||||||
|
|
||||||
|
@ -167,6 +172,9 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
||||||
# continue to make use of it:
|
# continue to make use of it:
|
||||||
mkdir -p $PKG/var/lib/hp/
|
mkdir -p $PKG/var/lib/hp/
|
||||||
|
|
||||||
|
# HAL is long gone:
|
||||||
|
rm -rf $PKG/usr/share/hal
|
||||||
|
|
||||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
|
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
|
||||||
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
cd $(dirname $0) ; CWD=$(pwd)
|
cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=gnucobol
|
PKGNAM=gnucobol
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-1}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
|
@ -75,7 +75,7 @@ mkdir -p $TMP $PKG
|
||||||
|
|
||||||
cd $TMP
|
cd $TMP
|
||||||
rm -rf $PKGNAM-$VERSION
|
rm -rf $PKGNAM-$VERSION
|
||||||
tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
|
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
|
||||||
cd $PKGNAM-$VERSION || exit 1
|
cd $PKGNAM-$VERSION || exit 1
|
||||||
|
|
||||||
chown -R root:root .
|
chown -R root:root .
|
||||||
|
|
|
@ -2375,6 +2375,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
|
||||||
CONFIG_NVME_CORE=y
|
CONFIG_NVME_CORE=y
|
||||||
CONFIG_BLK_DEV_NVME=y
|
CONFIG_BLK_DEV_NVME=y
|
||||||
CONFIG_NVME_MULTIPATH=y
|
CONFIG_NVME_MULTIPATH=y
|
||||||
|
CONFIG_NVME_HWMON=y
|
||||||
CONFIG_NVME_FABRICS=m
|
CONFIG_NVME_FABRICS=m
|
||||||
CONFIG_NVME_RDMA=m
|
CONFIG_NVME_RDMA=m
|
||||||
CONFIG_NVME_FC=m
|
CONFIG_NVME_FC=m
|
||||||
|
@ -4587,6 +4588,7 @@ CONFIG_POWER_RESET=y
|
||||||
# CONFIG_POWER_RESET_RESTART is not set
|
# CONFIG_POWER_RESET_RESTART is not set
|
||||||
CONFIG_POWER_SUPPLY=y
|
CONFIG_POWER_SUPPLY=y
|
||||||
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
||||||
|
CONFIG_POWER_SUPPLY_HWMON=y
|
||||||
CONFIG_PDA_POWER=m
|
CONFIG_PDA_POWER=m
|
||||||
CONFIG_GENERIC_ADC_BATTERY=m
|
CONFIG_GENERIC_ADC_BATTERY=m
|
||||||
CONFIG_TEST_POWER=m
|
CONFIG_TEST_POWER=m
|
||||||
|
@ -4626,7 +4628,7 @@ CONFIG_CHARGER_RT9455=m
|
||||||
CONFIG_CHARGER_CROS_USBPD=m
|
CONFIG_CHARGER_CROS_USBPD=m
|
||||||
CONFIG_CHARGER_BD99954=m
|
CONFIG_CHARGER_BD99954=m
|
||||||
CONFIG_CHARGER_WILCO=m
|
CONFIG_CHARGER_WILCO=m
|
||||||
CONFIG_HWMON=m
|
CONFIG_HWMON=y
|
||||||
CONFIG_HWMON_VID=m
|
CONFIG_HWMON_VID=m
|
||||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||||
|
|
||||||
|
@ -4832,6 +4834,7 @@ CONFIG_THERMAL=y
|
||||||
CONFIG_THERMAL_NETLINK=y
|
CONFIG_THERMAL_NETLINK=y
|
||||||
CONFIG_THERMAL_STATISTICS=y
|
CONFIG_THERMAL_STATISTICS=y
|
||||||
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
||||||
|
CONFIG_THERMAL_HWMON=y
|
||||||
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
||||||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
||||||
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
||||||
|
|
|
@ -2433,6 +2433,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
|
||||||
CONFIG_NVME_CORE=y
|
CONFIG_NVME_CORE=y
|
||||||
CONFIG_BLK_DEV_NVME=y
|
CONFIG_BLK_DEV_NVME=y
|
||||||
CONFIG_NVME_MULTIPATH=y
|
CONFIG_NVME_MULTIPATH=y
|
||||||
|
CONFIG_NVME_HWMON=y
|
||||||
CONFIG_NVME_FABRICS=m
|
CONFIG_NVME_FABRICS=m
|
||||||
CONFIG_NVME_RDMA=m
|
CONFIG_NVME_RDMA=m
|
||||||
CONFIG_NVME_FC=m
|
CONFIG_NVME_FC=m
|
||||||
|
@ -4598,6 +4599,7 @@ CONFIG_POWER_RESET=y
|
||||||
# CONFIG_POWER_RESET_RESTART is not set
|
# CONFIG_POWER_RESET_RESTART is not set
|
||||||
CONFIG_POWER_SUPPLY=y
|
CONFIG_POWER_SUPPLY=y
|
||||||
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
||||||
|
CONFIG_POWER_SUPPLY_HWMON=y
|
||||||
CONFIG_PDA_POWER=m
|
CONFIG_PDA_POWER=m
|
||||||
CONFIG_GENERIC_ADC_BATTERY=m
|
CONFIG_GENERIC_ADC_BATTERY=m
|
||||||
CONFIG_TEST_POWER=m
|
CONFIG_TEST_POWER=m
|
||||||
|
@ -4637,7 +4639,7 @@ CONFIG_CHARGER_RT9455=m
|
||||||
CONFIG_CHARGER_CROS_USBPD=m
|
CONFIG_CHARGER_CROS_USBPD=m
|
||||||
CONFIG_CHARGER_BD99954=m
|
CONFIG_CHARGER_BD99954=m
|
||||||
CONFIG_CHARGER_WILCO=m
|
CONFIG_CHARGER_WILCO=m
|
||||||
CONFIG_HWMON=m
|
CONFIG_HWMON=y
|
||||||
CONFIG_HWMON_VID=m
|
CONFIG_HWMON_VID=m
|
||||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||||
|
|
||||||
|
@ -4844,6 +4846,7 @@ CONFIG_THERMAL=y
|
||||||
CONFIG_THERMAL_NETLINK=y
|
CONFIG_THERMAL_NETLINK=y
|
||||||
CONFIG_THERMAL_STATISTICS=y
|
CONFIG_THERMAL_STATISTICS=y
|
||||||
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
||||||
|
CONFIG_THERMAL_HWMON=y
|
||||||
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
||||||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
||||||
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
||||||
|
|
|
@ -2421,6 +2421,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
|
||||||
CONFIG_NVME_CORE=y
|
CONFIG_NVME_CORE=y
|
||||||
CONFIG_BLK_DEV_NVME=y
|
CONFIG_BLK_DEV_NVME=y
|
||||||
CONFIG_NVME_MULTIPATH=y
|
CONFIG_NVME_MULTIPATH=y
|
||||||
|
CONFIG_NVME_HWMON=y
|
||||||
CONFIG_NVME_FABRICS=m
|
CONFIG_NVME_FABRICS=m
|
||||||
CONFIG_NVME_RDMA=m
|
CONFIG_NVME_RDMA=m
|
||||||
CONFIG_NVME_FC=m
|
CONFIG_NVME_FC=m
|
||||||
|
@ -4633,6 +4634,7 @@ CONFIG_POWER_RESET=y
|
||||||
# CONFIG_POWER_RESET_RESTART is not set
|
# CONFIG_POWER_RESET_RESTART is not set
|
||||||
CONFIG_POWER_SUPPLY=y
|
CONFIG_POWER_SUPPLY=y
|
||||||
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
||||||
|
CONFIG_POWER_SUPPLY_HWMON=y
|
||||||
CONFIG_PDA_POWER=m
|
CONFIG_PDA_POWER=m
|
||||||
CONFIG_GENERIC_ADC_BATTERY=m
|
CONFIG_GENERIC_ADC_BATTERY=m
|
||||||
CONFIG_TEST_POWER=m
|
CONFIG_TEST_POWER=m
|
||||||
|
@ -4672,7 +4674,7 @@ CONFIG_CHARGER_RT9455=m
|
||||||
CONFIG_CHARGER_CROS_USBPD=m
|
CONFIG_CHARGER_CROS_USBPD=m
|
||||||
CONFIG_CHARGER_BD99954=m
|
CONFIG_CHARGER_BD99954=m
|
||||||
CONFIG_CHARGER_WILCO=m
|
CONFIG_CHARGER_WILCO=m
|
||||||
CONFIG_HWMON=m
|
CONFIG_HWMON=y
|
||||||
CONFIG_HWMON_VID=m
|
CONFIG_HWMON_VID=m
|
||||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||||
|
|
||||||
|
@ -4878,6 +4880,7 @@ CONFIG_THERMAL=y
|
||||||
CONFIG_THERMAL_NETLINK=y
|
CONFIG_THERMAL_NETLINK=y
|
||||||
CONFIG_THERMAL_STATISTICS=y
|
CONFIG_THERMAL_STATISTICS=y
|
||||||
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
||||||
|
CONFIG_THERMAL_HWMON=y
|
||||||
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
||||||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
||||||
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
||||||
|
|
|
@ -2375,6 +2375,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
|
||||||
CONFIG_NVME_CORE=y
|
CONFIG_NVME_CORE=y
|
||||||
CONFIG_BLK_DEV_NVME=y
|
CONFIG_BLK_DEV_NVME=y
|
||||||
CONFIG_NVME_MULTIPATH=y
|
CONFIG_NVME_MULTIPATH=y
|
||||||
|
CONFIG_NVME_HWMON=y
|
||||||
CONFIG_NVME_FABRICS=m
|
CONFIG_NVME_FABRICS=m
|
||||||
CONFIG_NVME_RDMA=m
|
CONFIG_NVME_RDMA=m
|
||||||
CONFIG_NVME_FC=m
|
CONFIG_NVME_FC=m
|
||||||
|
@ -4587,6 +4588,7 @@ CONFIG_POWER_RESET=y
|
||||||
# CONFIG_POWER_RESET_RESTART is not set
|
# CONFIG_POWER_RESET_RESTART is not set
|
||||||
CONFIG_POWER_SUPPLY=y
|
CONFIG_POWER_SUPPLY=y
|
||||||
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
||||||
|
CONFIG_POWER_SUPPLY_HWMON=y
|
||||||
CONFIG_PDA_POWER=m
|
CONFIG_PDA_POWER=m
|
||||||
CONFIG_GENERIC_ADC_BATTERY=m
|
CONFIG_GENERIC_ADC_BATTERY=m
|
||||||
CONFIG_TEST_POWER=m
|
CONFIG_TEST_POWER=m
|
||||||
|
@ -4626,7 +4628,7 @@ CONFIG_CHARGER_RT9455=m
|
||||||
CONFIG_CHARGER_CROS_USBPD=m
|
CONFIG_CHARGER_CROS_USBPD=m
|
||||||
CONFIG_CHARGER_BD99954=m
|
CONFIG_CHARGER_BD99954=m
|
||||||
CONFIG_CHARGER_WILCO=m
|
CONFIG_CHARGER_WILCO=m
|
||||||
CONFIG_HWMON=m
|
CONFIG_HWMON=y
|
||||||
CONFIG_HWMON_VID=m
|
CONFIG_HWMON_VID=m
|
||||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||||
|
|
||||||
|
@ -4832,6 +4834,7 @@ CONFIG_THERMAL=y
|
||||||
CONFIG_THERMAL_NETLINK=y
|
CONFIG_THERMAL_NETLINK=y
|
||||||
CONFIG_THERMAL_STATISTICS=y
|
CONFIG_THERMAL_STATISTICS=y
|
||||||
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
||||||
|
CONFIG_THERMAL_HWMON=y
|
||||||
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
||||||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
||||||
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
||||||
|
|
|
@ -2433,6 +2433,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
|
||||||
CONFIG_NVME_CORE=y
|
CONFIG_NVME_CORE=y
|
||||||
CONFIG_BLK_DEV_NVME=y
|
CONFIG_BLK_DEV_NVME=y
|
||||||
CONFIG_NVME_MULTIPATH=y
|
CONFIG_NVME_MULTIPATH=y
|
||||||
|
CONFIG_NVME_HWMON=y
|
||||||
CONFIG_NVME_FABRICS=m
|
CONFIG_NVME_FABRICS=m
|
||||||
CONFIG_NVME_RDMA=m
|
CONFIG_NVME_RDMA=m
|
||||||
CONFIG_NVME_FC=m
|
CONFIG_NVME_FC=m
|
||||||
|
@ -4598,6 +4599,7 @@ CONFIG_POWER_RESET=y
|
||||||
# CONFIG_POWER_RESET_RESTART is not set
|
# CONFIG_POWER_RESET_RESTART is not set
|
||||||
CONFIG_POWER_SUPPLY=y
|
CONFIG_POWER_SUPPLY=y
|
||||||
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
||||||
|
CONFIG_POWER_SUPPLY_HWMON=y
|
||||||
CONFIG_PDA_POWER=m
|
CONFIG_PDA_POWER=m
|
||||||
CONFIG_GENERIC_ADC_BATTERY=m
|
CONFIG_GENERIC_ADC_BATTERY=m
|
||||||
CONFIG_TEST_POWER=m
|
CONFIG_TEST_POWER=m
|
||||||
|
@ -4637,7 +4639,7 @@ CONFIG_CHARGER_RT9455=m
|
||||||
CONFIG_CHARGER_CROS_USBPD=m
|
CONFIG_CHARGER_CROS_USBPD=m
|
||||||
CONFIG_CHARGER_BD99954=m
|
CONFIG_CHARGER_BD99954=m
|
||||||
CONFIG_CHARGER_WILCO=m
|
CONFIG_CHARGER_WILCO=m
|
||||||
CONFIG_HWMON=m
|
CONFIG_HWMON=y
|
||||||
CONFIG_HWMON_VID=m
|
CONFIG_HWMON_VID=m
|
||||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||||
|
|
||||||
|
@ -4844,6 +4846,7 @@ CONFIG_THERMAL=y
|
||||||
CONFIG_THERMAL_NETLINK=y
|
CONFIG_THERMAL_NETLINK=y
|
||||||
CONFIG_THERMAL_STATISTICS=y
|
CONFIG_THERMAL_STATISTICS=y
|
||||||
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
||||||
|
CONFIG_THERMAL_HWMON=y
|
||||||
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
||||||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
||||||
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
||||||
|
|
|
@ -2421,6 +2421,7 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
|
||||||
CONFIG_NVME_CORE=y
|
CONFIG_NVME_CORE=y
|
||||||
CONFIG_BLK_DEV_NVME=y
|
CONFIG_BLK_DEV_NVME=y
|
||||||
CONFIG_NVME_MULTIPATH=y
|
CONFIG_NVME_MULTIPATH=y
|
||||||
|
CONFIG_NVME_HWMON=y
|
||||||
CONFIG_NVME_FABRICS=m
|
CONFIG_NVME_FABRICS=m
|
||||||
CONFIG_NVME_RDMA=m
|
CONFIG_NVME_RDMA=m
|
||||||
CONFIG_NVME_FC=m
|
CONFIG_NVME_FC=m
|
||||||
|
@ -4633,6 +4634,7 @@ CONFIG_POWER_RESET=y
|
||||||
# CONFIG_POWER_RESET_RESTART is not set
|
# CONFIG_POWER_RESET_RESTART is not set
|
||||||
CONFIG_POWER_SUPPLY=y
|
CONFIG_POWER_SUPPLY=y
|
||||||
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
||||||
|
CONFIG_POWER_SUPPLY_HWMON=y
|
||||||
CONFIG_PDA_POWER=m
|
CONFIG_PDA_POWER=m
|
||||||
CONFIG_GENERIC_ADC_BATTERY=m
|
CONFIG_GENERIC_ADC_BATTERY=m
|
||||||
CONFIG_TEST_POWER=m
|
CONFIG_TEST_POWER=m
|
||||||
|
@ -4672,7 +4674,7 @@ CONFIG_CHARGER_RT9455=m
|
||||||
CONFIG_CHARGER_CROS_USBPD=m
|
CONFIG_CHARGER_CROS_USBPD=m
|
||||||
CONFIG_CHARGER_BD99954=m
|
CONFIG_CHARGER_BD99954=m
|
||||||
CONFIG_CHARGER_WILCO=m
|
CONFIG_CHARGER_WILCO=m
|
||||||
CONFIG_HWMON=m
|
CONFIG_HWMON=y
|
||||||
CONFIG_HWMON_VID=m
|
CONFIG_HWMON_VID=m
|
||||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||||
|
|
||||||
|
@ -4878,6 +4880,7 @@ CONFIG_THERMAL=y
|
||||||
CONFIG_THERMAL_NETLINK=y
|
CONFIG_THERMAL_NETLINK=y
|
||||||
CONFIG_THERMAL_STATISTICS=y
|
CONFIG_THERMAL_STATISTICS=y
|
||||||
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
|
||||||
|
CONFIG_THERMAL_HWMON=y
|
||||||
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
||||||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
||||||
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
3
|
4
|
||||||
|
|
|
@ -12,6 +12,7 @@ chown sddm:sddm $PKG/var/lib/sddm
|
||||||
# D-Bus configs should be under /usr, not /etc:
|
# D-Bus configs should be under /usr, not /etc:
|
||||||
mkdir -p $PKG/usr/share/dbus-1/system.d
|
mkdir -p $PKG/usr/share/dbus-1/system.d
|
||||||
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d
|
||||||
|
|
||||||
# Remove the sddm.conf file because we will generate our own in doinst.sh:
|
# Remove the sddm.conf file because we will generate our own in doinst.sh:
|
||||||
rm -f $PKG/etc/sddm.conf
|
rm -f $PKG/etc/sddm.conf
|
||||||
|
|
|
@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=GConf
|
PKGNAM=GConf
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-4}
|
BUILD=${BUILD:-5}
|
||||||
|
|
||||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||||
|
|
||||||
|
@ -99,6 +99,11 @@ CXXFLAGS="$SLKCFLAGS" \
|
||||||
make $NUMJOBS || make || exit 1
|
make $NUMJOBS || make || exit 1
|
||||||
make install DESTDIR=$PKG || exit 1
|
make install DESTDIR=$PKG || exit 1
|
||||||
|
|
||||||
|
# Move dbus configs to system location:
|
||||||
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
|
|
||||||
# Don't ship .la files:
|
# Don't ship .la files:
|
||||||
rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
|
rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=accountsservice
|
PKGNAM=accountsservice
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -115,6 +115,11 @@ meson setup \
|
||||||
DESTDIR=$PKG $NINJA install || exit 1
|
DESTDIR=$PKG $NINJA install || exit 1
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
|
# Move dbus configs to system location:
|
||||||
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
|
|
||||||
# Strip binaries:
|
# Strip binaries:
|
||||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
cd $(dirname $0) ; CWD=$(pwd)
|
cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=cryptopp
|
PKGNAM=cryptopp
|
||||||
VERSION=${VERSION:-8.2.0}
|
VERSION=${VERSION:-8.3.0}
|
||||||
SRCVER=$(echo $VERSION | tr -d '.')
|
SRCVER=$(echo $VERSION | tr -d '.')
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-1}
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
https://www.cryptopp.com/cryptopp820.zip
|
https://www.cryptopp.com/cryptopp830.zip
|
||||||
|
|
|
@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=harfbuzz
|
PKGNAM=harfbuzz
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-2}
|
BUILD=${BUILD:-1}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
|
|
@ -9,8 +9,7 @@ config() {
|
||||||
fi
|
fi
|
||||||
# Otherwise, we leave the .new copy for the admin to consider...
|
# Otherwise, we leave the .new copy for the admin to consider...
|
||||||
}
|
}
|
||||||
config etc/polkit-1/rules.d/20-plugdev-group-mount-override.rules.new
|
|
||||||
config etc/polkit-1/rules.d/10-org.freedesktop.NetworkManager.rules.new
|
|
||||||
if [ -r etc/pam.d/polkit-1.new ]; then
|
if [ -r etc/pam.d/polkit-1.new ]; then
|
||||||
config etc/pam.d/polkit-1.new
|
config etc/pam.d/polkit-1.new
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=polkit
|
PKGNAM=polkit
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-2}
|
BUILD=${BUILD:-3}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -144,9 +144,13 @@ rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
||||||
# actually used for anything later. Perms don't matter.
|
# actually used for anything later. Perms don't matter.
|
||||||
mkdir -p $PKG/var/lib/polkit
|
mkdir -p $PKG/var/lib/polkit
|
||||||
|
|
||||||
# Add default policy files for udisks2 and NetworkManager events:
|
# Move dbus configs to system location:
|
||||||
cat $CWD/10-org.freedesktop.NetworkManager.rules > $PKG/etc/polkit-1/rules.d/10-org.freedesktop.NetworkManager.rules.new
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
cat $CWD/20-plugdev-group-mount-override.rules > $PKG/etc/polkit-1/rules.d/20-plugdev-group-mount-override.rules.new
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
|
|
||||||
|
# Leave the /etc/polkit-1/rules.d/ dir in place, but move the config(s)
|
||||||
|
mv $PKG/etc/polkit-1/rules.d/* $PKG/usr/share/polkit-1/rules.d/
|
||||||
|
|
||||||
if [ ! -z "$PAM_OPTIONS" ]; then
|
if [ ! -z "$PAM_OPTIONS" ]; then
|
||||||
# Make the PAM file .new:
|
# Make the PAM file .new:
|
||||||
|
|
|
@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=pulseaudio
|
PKGNAM=pulseaudio
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
|
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
case "$( uname -m )" in
|
case "$( uname -m )" in
|
||||||
|
@ -124,6 +124,11 @@ cd ..
|
||||||
# Strip binaries:
|
# Strip binaries:
|
||||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||||
|
|
||||||
|
# Move dbus configs to system location:
|
||||||
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
|
|
||||||
# Move config files to .new:
|
# Move config files to .new:
|
||||||
for f in $( find $PKG/etc/pulse/ -type f ) ; do mv $f $f.new ; done
|
for f in $( find $PKG/etc/pulse/ -type f ) ; do mv $f $f.new ; done
|
||||||
|
|
||||||
|
|
|
@ -11,9 +11,6 @@ config() {
|
||||||
# Otherwise, we leave the .new copy for the admin to consider...
|
# Otherwise, we leave the .new copy for the admin to consider...
|
||||||
}
|
}
|
||||||
|
|
||||||
config etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf.new
|
|
||||||
config etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf.new
|
|
||||||
|
|
||||||
# Update the desktop database:
|
# Update the desktop database:
|
||||||
if [ -x usr/bin/update-desktop-database ]; then
|
if [ -x usr/bin/update-desktop-database ]; then
|
||||||
chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
|
chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1
|
||||||
|
|
|
@ -4,30 +4,28 @@
|
||||||
# Copyright 2010, 2011, 2012, 2013, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
|
# Copyright 2010, 2011, 2012, 2013, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, and distribute this software for
|
# Redistribution and use of this script, with or without modification, is
|
||||||
# any purpose with or without fee is hereby granted, provided that
|
# permitted provided that the following conditions are met:
|
||||||
# the above copyright notice and this permission notice appear in all
|
|
||||||
# copies.
|
|
||||||
#
|
#
|
||||||
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
|
# 1. Redistributions of this script must retain the above copyright
|
||||||
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
# notice, this list of conditions and the following disclaimer.
|
||||||
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
#
|
||||||
# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
|
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||||
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
||||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
|
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||||||
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
|
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||||
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||||||
# SUCH DAMAGE.
|
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||||||
# -----------------------------------------------------------------------------
|
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
cd $(dirname $0) ; CWD=$(pwd)
|
cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=system-config-printer
|
PKGNAM=system-config-printer
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-5}
|
BUILD=${BUILD:-6}
|
||||||
|
|
||||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||||
|
|
||||||
|
@ -127,16 +125,17 @@ python3 -O -m compileall "${PKG}/usr/share/system-config-printer"
|
||||||
mkdir -p $PKG/lib
|
mkdir -p $PKG/lib
|
||||||
mv $PKG/etc/udev $PKG/lib/
|
mv $PKG/etc/udev $PKG/lib/
|
||||||
|
|
||||||
|
# Move the dbus configs to the system location:
|
||||||
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
|
|
||||||
if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
|
if [ ! -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
|
||||||
# Looks like PAM is not installed. Instead, your user must be in group 'lp'.
|
# Looks like PAM is not installed. Instead, your user must be in group 'lp'.
|
||||||
sed -i -e 's/at_console="true"/group="lp"/g' \
|
sed -i -e 's/at_console="true"/group="lp"/g' \
|
||||||
$PKG/etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
|
$PKG/usr/share/dbus-1/system.d/com.redhat.NewPrinterNotification.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Don't clobber the configuration file:
|
|
||||||
mv $PKG/etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf{,.new}
|
|
||||||
mv $PKG/etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf{,.new}
|
|
||||||
|
|
||||||
# Add documentation:
|
# Add documentation:
|
||||||
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
|
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
|
||||||
cp -a \
|
cp -a \
|
||||||
|
|
|
@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=ModemManager
|
PKGNAM=ModemManager
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
|
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
case "$( uname -m )" in
|
case "$( uname -m )" in
|
||||||
|
@ -81,6 +81,8 @@ find . \
|
||||||
|
|
||||||
zcat $CWD/WeDoNotHaveSystemD.patch.gz | patch -p1 --verbose || exit 1
|
zcat $CWD/WeDoNotHaveSystemD.patch.gz | patch -p1 --verbose || exit 1
|
||||||
|
|
||||||
|
LIBSYSTEMD_LOGIN_CFLAGS="$(pkg-config --cflags libelogind)" \
|
||||||
|
LIBSYSTEMD_LOGIN_LIBS="$(pkg-config --libs libelogind)" \
|
||||||
CFLAGS="$SLKCFLAGS -Wno-incompatible-pointer-types" \
|
CFLAGS="$SLKCFLAGS -Wno-incompatible-pointer-types" \
|
||||||
CXXFLAGS="$SLKCFLAGS" \
|
CXXFLAGS="$SLKCFLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
|
@ -92,11 +94,17 @@ CXXFLAGS="$SLKCFLAGS" \
|
||||||
--mandir=/usr/man \
|
--mandir=/usr/man \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
--docdir=/usr/doc/$PKGNAM-$VERSION \
|
--docdir=/usr/doc/$PKGNAM-$VERSION \
|
||||||
|
--with-systemd-suspend-resume \
|
||||||
--build=$ARCH-slackware-linux || exit 1
|
--build=$ARCH-slackware-linux || exit 1
|
||||||
|
|
||||||
make $NUMJOBS || exit 1
|
make $NUMJOBS || exit 1
|
||||||
make install DESTDIR=$PKG || exit 1
|
make install DESTDIR=$PKG || exit 1
|
||||||
|
|
||||||
|
# Move dbus configs to system location:
|
||||||
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
|
|
||||||
# Don't ship .la files:
|
# Don't ship .la files:
|
||||||
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=NetworkManager
|
PKGNAM=NetworkManager
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
MARCH=$( uname -m )
|
MARCH=$( uname -m )
|
||||||
|
@ -182,6 +182,10 @@ mkdir -p $PKG/etc/NetworkManager/conf.d
|
||||||
cat $CWD/conf.d/00-dhcp-client.conf > $PKG/etc/NetworkManager/conf.d/00-dhcp-client.conf.new
|
cat $CWD/conf.d/00-dhcp-client.conf > $PKG/etc/NetworkManager/conf.d/00-dhcp-client.conf.new
|
||||||
cat $CWD/conf.d/00-rc-manager.conf > $PKG/etc/NetworkManager/conf.d/00-rc-manager.conf.new
|
cat $CWD/conf.d/00-rc-manager.conf > $PKG/etc/NetworkManager/conf.d/00-rc-manager.conf.new
|
||||||
|
|
||||||
|
# Add default polkit rules for NM
|
||||||
|
mkdir -p $PKG/usr/share/polkit-1/rules.d/
|
||||||
|
cat $CWD/10-org.freedesktop.NetworkManager.rules > $PKG/usr/share/polkit-1/rules.d/10-org.freedesktop.NetworkManager.rules
|
||||||
|
|
||||||
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
|
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
|
||||||
cp -a \
|
cp -a \
|
||||||
AUTHORS CONTRIBUTING COPYING ChangeLog INSTALL NEWS README TODO \
|
AUTHORS CONTRIBUTING COPYING ChangeLog INSTALL NEWS README TODO \
|
||||||
|
|
|
@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=bluez
|
PKGNAM=bluez
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
|
|
||||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||||
|
|
||||||
|
@ -129,6 +129,11 @@ chmod 644 $PKG/lib/modprobe.d/btusb.conf
|
||||||
mkdir -p $PKG/usr/sbin
|
mkdir -p $PKG/usr/sbin
|
||||||
ln -s ../libexec/bluetooth/bluetoothd $PKG/usr/sbin
|
ln -s ../libexec/bluetooth/bluetoothd $PKG/usr/sbin
|
||||||
|
|
||||||
|
# Move the dbus config file to the system directory
|
||||||
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
|
|
||||||
# Fix substitution in /usr/share/dbus-1/services/org.bluez.obex.service:
|
# Fix substitution in /usr/share/dbus-1/services/org.bluez.obex.service:
|
||||||
if [ -x $PKG/usr/libexec/bluetooth/obexd ]; then
|
if [ -x $PKG/usr/libexec/bluetooth/obexd ]; then
|
||||||
sed -i "s|@libexecdir@|/usr/libexec|g" $PKG/usr/share/dbus-1/services/org.bluez.obex.service
|
sed -i "s|@libexecdir@|/usr/libexec|g" $PKG/usr/share/dbus-1/services/org.bluez.obex.service
|
||||||
|
|
22
source/n/netatalk/netatalk-invalid_dircache_entries.patch
Normal file
22
source/n/netatalk/netatalk-invalid_dircache_entries.patch
Normal file
|
@ -0,0 +1,22 @@
|
||||||
|
From 32df6e155ccfc83216321925273c3e75e631ebe6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Andrew Bauer <zonexpertconsulting@outlook.com>
|
||||||
|
Date: Wed, 22 Jan 2020 09:59:47 -0600
|
||||||
|
Subject: [PATCH] fix ftbs multiple def of invalid_dircache_entries
|
||||||
|
|
||||||
|
---
|
||||||
|
etc/afpd/directory.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/etc/afpd/directory.h b/etc/afpd/directory.h
|
||||||
|
index eb89c606..81bfa9cb 100644
|
||||||
|
--- a/etc/afpd/directory.h
|
||||||
|
+++ b/etc/afpd/directory.h
|
||||||
|
@@ -91,7 +91,7 @@ struct maccess {
|
||||||
|
#define AR_UWRITE (1<<2)
|
||||||
|
#define AR_UOWN (1<<7)
|
||||||
|
|
||||||
|
-q_t *invalid_dircache_entries;
|
||||||
|
+extern q_t *invalid_dircache_entries;
|
||||||
|
|
||||||
|
typedef int (*dir_loop)(struct dirent *, char *, void *);
|
||||||
|
|
|
@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=netatalk
|
PKGNAM=netatalk
|
||||||
VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo netatalk-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-4}
|
BUILD=${BUILD:-5}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -78,6 +78,9 @@ find . \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||||
-exec chmod 644 {} \+
|
-exec chmod 644 {} \+
|
||||||
|
|
||||||
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1793912
|
||||||
|
zcat $CWD/netatalk-invalid_dircache_entries.patch.gz | patch -p1 --verbose || exit 1
|
||||||
|
|
||||||
# Choose correct options depending on whether PAM is installed:
|
# Choose correct options depending on whether PAM is installed:
|
||||||
if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
|
if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
|
||||||
PAM_OPTIONS="--with-pam-confdir=/etc/pam.d --with-pam --enable-ddp"
|
PAM_OPTIONS="--with-pam-confdir=/etc/pam.d --with-pam --enable-ddp"
|
||||||
|
@ -101,7 +104,7 @@ CFLAGS="$SLKCFLAGS" \
|
||||||
$PAM_OPTIONS \
|
$PAM_OPTIONS \
|
||||||
$SHADOW_OPTIONS \
|
$SHADOW_OPTIONS \
|
||||||
--with-libevent=system \
|
--with-libevent=system \
|
||||||
--with-dbus-sysconf-dir=/etc/dbus-1/system.d/ \
|
--with-dbus-sysconf-dir=/usr/share/dbus-1/system.d/ \
|
||||||
--with-dbus-daemon=/usr/bin/dbus-daemon \
|
--with-dbus-daemon=/usr/bin/dbus-daemon \
|
||||||
--build=$ARCH-slackware-linux || exit 1
|
--build=$ARCH-slackware-linux || exit 1
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=wpa_supplicant
|
PKGNAM=wpa_supplicant
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-2}
|
BUILD=${BUILD:-3}
|
||||||
|
|
||||||
SRCVERSION=$(printf $VERSION | tr _ -)
|
SRCVERSION=$(printf $VERSION | tr _ -)
|
||||||
|
|
||||||
|
@ -136,9 +136,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
|
||||||
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||||
|
|
||||||
# Install dbus configuration file:
|
# Install dbus configuration file:
|
||||||
mkdir -p $PKG/etc/dbus-1/system.d/
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
cp dbus/dbus-wpa_supplicant.conf \
|
cp dbus/dbus-wpa_supplicant.conf \
|
||||||
$PKG/etc/dbus-1/system.d/dbus-wpa_supplicant.conf
|
$PKG/usr/share/dbus-1/system.d/dbus-wpa_supplicant.conf
|
||||||
|
|
||||||
mkdir -p $PKG/usr/share/dbus-1/system-services
|
mkdir -p $PKG/usr/share/dbus-1/system-services
|
||||||
install -m644 dbus/*.service $PKG/usr/share/dbus-1/system-services/
|
install -m644 dbus/*.service $PKG/usr/share/dbus-1/system-services/
|
||||||
|
|
|
@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
PKGNAM=mesa
|
PKGNAM=mesa
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
DEMOVERS=${DEMOVERS:-8.4.0}
|
DEMOVERS=${DEMOVERS:-8.4.0}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
BUILD_DEMOS=${BUILD_DEMOS:-YES}
|
BUILD_DEMOS=${BUILD_DEMOS:-YES}
|
||||||
|
|
||||||
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
|
||||||
|
@ -97,7 +97,7 @@ find . \
|
||||||
# git format-patch 93c2beafc0a7fa2f210b006d22aba61caa71f773 # 17.2.6 release
|
# git format-patch 93c2beafc0a7fa2f210b006d22aba61caa71f773 # 17.2.6 release
|
||||||
if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
|
if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
|
||||||
for patch in $CWD/patches/*.patch ; do
|
for patch in $CWD/patches/*.patch ; do
|
||||||
patch -p1 < $patch || exit 1 ;
|
patch -p1 --verbose < $patch || exit 1 ;
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
From f93b7d14d66d8ba70d44772d1a1b6696310b7d17 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Witold Baryluk <witold.baryluk@gmail.com>
|
||||||
|
Date: Mon, 7 Dec 2020 20:45:42 +0000
|
||||||
|
Subject: [PATCH] vulkan/device_select: Store Vulkan vendorID and deviceID as
|
||||||
|
uint32_t
|
||||||
|
|
||||||
|
Vulkan uses 32-bit IDs, compared to PCI/USB 16-bit ones.
|
||||||
|
|
||||||
|
Some driver vendorIDs do exceed 0xffff, including MESA (used by lavapipe).
|
||||||
|
|
||||||
|
Without this, the value will be truncated, and device select layer
|
||||||
|
will not match expected (or any) device.
|
||||||
|
|
||||||
|
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3935
|
||||||
|
Reviewed-by: Dave Airlie <airlied@redhat.com>
|
||||||
|
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7977>
|
||||||
|
---
|
||||||
|
src/vulkan/device-select-layer/device_select.h | 10 +++++++++-
|
||||||
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/vulkan/device-select-layer/device_select.h b/src/vulkan/device-select-layer/device_select.h
|
||||||
|
index 23350707a33..248878fbc71 100644
|
||||||
|
--- a/src/vulkan/device-select-layer/device_select.h
|
||||||
|
+++ b/src/vulkan/device-select-layer/device_select.h
|
||||||
|
@@ -24,10 +24,18 @@
|
||||||
|
#define DEVICE_SELECT_H
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
+#include <stdint.h>
|
||||||
|
#include "xf86drm.h"
|
||||||
|
|
||||||
|
+/* We don't use `drmPciDeviceInfo` because it uses 16-bit ids,
|
||||||
|
+ * instead of Vulkan's 32-bit ones. */
|
||||||
|
+struct device_info {
|
||||||
|
+ uint32_t vendor_id;
|
||||||
|
+ uint32_t device_id;
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
struct device_pci_info {
|
||||||
|
- drmPciDeviceInfo dev_info;
|
||||||
|
+ struct device_info dev_info;
|
||||||
|
drmPciBusInfo bus_info;
|
||||||
|
bool has_bus_info;
|
||||||
|
bool cpu_device;
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=blueman
|
PKGNAM=blueman
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-2}
|
BUILD=${BUILD:-3}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -123,6 +123,11 @@ sed -i "s,#!/usr/bin/env python3,#!/usr/bin/python${PYTHON3VER},g" module/_bluem
|
||||||
make $NUMJOBS || make || exit 1
|
make $NUMJOBS || make || exit 1
|
||||||
make install DESTDIR=$PKG || exit 1
|
make install DESTDIR=$PKG || exit 1
|
||||||
|
|
||||||
|
# Move the dbus config file to the system directory
|
||||||
|
mkdir -p $PKG/usr/share/dbus-1/system.d/
|
||||||
|
mv $PKG/etc/dbus-1/system.d/* $PKG/usr/share/dbus-1/system.d/
|
||||||
|
rmdir --parents $PKG/etc/dbus-1/system.d/
|
||||||
|
|
||||||
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
|
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
|
||||||
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
|
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
|
||||||
|
|
||||||
|
|
11
source/xap/xgames/spider.gcc10.diff
Normal file
11
source/xap/xgames/spider.gcc10.diff
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- ./Makefile.orig 2020-12-24 15:54:29.538553593 -0600
|
||||||
|
+++ ./Makefile 2020-12-24 15:56:23.320547299 -0600
|
||||||
|
@@ -295,7 +295,7 @@
|
||||||
|
|
||||||
|
ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
|
||||||
|
ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
|
||||||
|
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
|
||||||
|
+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -fcommon
|
||||||
|
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
|
||||||
|
LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS)
|
||||||
|
LDPOSTLIB =
|
|
@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=xgames
|
PKGNAM=xgames
|
||||||
VERSION=0.3
|
VERSION=0.3
|
||||||
BUILD=${BUILD:-5}
|
BUILD=${BUILD:-6}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -53,10 +53,11 @@ mkdir -p $TMP $PKG
|
||||||
|
|
||||||
# Build spider:
|
# Build spider:
|
||||||
cd $TMP
|
cd $TMP
|
||||||
tar xvf $CWD/spider.tar.gz || exit 1
|
tar xvf $CWD/spider.tar.lz || exit 1
|
||||||
cd spider || exit 1
|
cd spider || exit 1
|
||||||
zcat $CWD/spider.diff.gz | patch -p1 --verbose || exit 1
|
zcat $CWD/spider.diff.gz | patch -p1 --verbose || exit 1
|
||||||
xmkmf
|
xmkmf
|
||||||
|
zcat $CWD/spider.gcc10.diff.gz | patch -p1 --verbose || exit 1
|
||||||
make $NUMJOBS || make || exit 1
|
make $NUMJOBS || make || exit 1
|
||||||
mkdir -p $PKG/usr/bin
|
mkdir -p $PKG/usr/bin
|
||||||
cat spider > $PKG/usr/bin/spider
|
cat spider > $PKG/usr/bin/spider
|
||||||
|
@ -67,7 +68,7 @@ cp -a README* $PKG/usr/doc/xgames-$VERSION/spider
|
||||||
|
|
||||||
# Build maze:
|
# Build maze:
|
||||||
cd $TMP
|
cd $TMP
|
||||||
tar xvf $CWD/maze.tar.gz || exit 1
|
tar xvf $CWD/maze.tar.lz || exit 1
|
||||||
cd maze || exit 1
|
cd maze || exit 1
|
||||||
zcat $CWD/maze.diff.gz | patch -p1 || exit 1
|
zcat $CWD/maze.diff.gz | patch -p1 || exit 1
|
||||||
xmkmf
|
xmkmf
|
||||||
|
@ -79,7 +80,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/maze
|
||||||
|
|
||||||
# Build xcolormap:
|
# Build xcolormap:
|
||||||
cd $TMP
|
cd $TMP
|
||||||
tar xvf $CWD/xcolormap.tar.gz || exit 1
|
tar xvf $CWD/xcolormap.tar.lz || exit 1
|
||||||
cd xcolormap || exit 1
|
cd xcolormap || exit 1
|
||||||
zcat $CWD/xcolormap.diff.gz | patch -p1 || exit 1
|
zcat $CWD/xcolormap.diff.gz | patch -p1 || exit 1
|
||||||
make $NUMJOBS || make || exit 1
|
make $NUMJOBS || make || exit 1
|
||||||
|
@ -89,7 +90,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xcolormap
|
||||||
|
|
||||||
# Build xcuckoo:
|
# Build xcuckoo:
|
||||||
cd $TMP
|
cd $TMP
|
||||||
tar xvf $CWD/xcuckoo-1.1.tar.gz || exit 1
|
tar xvf $CWD/xcuckoo-1.1.tar.lz || exit 1
|
||||||
cd xcuckoo || exit 1
|
cd xcuckoo || exit 1
|
||||||
zcat $CWD/xcuckoo.diff.gz | patch -p1 --verbose || exit 1
|
zcat $CWD/xcuckoo.diff.gz | patch -p1 --verbose || exit 1
|
||||||
xmkmf
|
xmkmf
|
||||||
|
@ -101,7 +102,7 @@ cp -a CHANGES $PKG/usr/doc/xgames-$VERSION/xcuckoo
|
||||||
|
|
||||||
# Build xlander:
|
# Build xlander:
|
||||||
cd $TMP
|
cd $TMP
|
||||||
tar xvf $CWD/xlander.tar.gz || exit 1
|
tar xvf $CWD/xlander.tar.lz || exit 1
|
||||||
cd xlander || exit 1
|
cd xlander || exit 1
|
||||||
zcat $CWD/xlander.fixes.diff.gz | patch -p1 || exit 1
|
zcat $CWD/xlander.fixes.diff.gz | patch -p1 || exit 1
|
||||||
zcat $CWD/xlander-2009-07-18.diff.gz | patch -p1 || exit 1
|
zcat $CWD/xlander-2009-07-18.diff.gz | patch -p1 || exit 1
|
||||||
|
@ -114,7 +115,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xlander
|
||||||
|
|
||||||
# Build xminesweep:
|
# Build xminesweep:
|
||||||
cd $TMP
|
cd $TMP
|
||||||
tar xvf $CWD/xminesweep3.0.tar.gz || exit 1
|
tar xvf $CWD/xminesweep3.0.tar.lz || exit 1
|
||||||
cd xminesweep3.0 || exit 1
|
cd xminesweep3.0 || exit 1
|
||||||
xmkmf
|
xmkmf
|
||||||
make $NUMJOBS || make || exit 1
|
make $NUMJOBS || make || exit 1
|
||||||
|
@ -125,7 +126,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xminesweep
|
||||||
|
|
||||||
# Build xneko:
|
# Build xneko:
|
||||||
cd $TMP
|
cd $TMP
|
||||||
tar xvf $CWD/xneko.tar.gz || exit 1
|
tar xvf $CWD/xneko.tar.lz || exit 1
|
||||||
cd xneko || exit 1
|
cd xneko || exit 1
|
||||||
xmkmf
|
xmkmf
|
||||||
make $NUMJOBS || make || exit 1
|
make $NUMJOBS || make || exit 1
|
||||||
|
@ -136,7 +137,7 @@ cp -a README $PKG/usr/doc/xgames-$VERSION/xneko
|
||||||
|
|
||||||
# Build xroach:
|
# Build xroach:
|
||||||
cd $TMP
|
cd $TMP
|
||||||
tar xvf $CWD/xroach.tar.gz || exit 1
|
tar xvf $CWD/xroach.tar.lz || exit 1
|
||||||
cd xroach || exit 1
|
cd xroach || exit 1
|
||||||
xmkmf
|
xmkmf
|
||||||
make $NUMJOBS || make || exit 1
|
make $NUMJOBS || make || exit 1
|
||||||
|
@ -145,24 +146,13 @@ cat xroach.man | gzip -9c > $PKG/usr/man/man6/xroach.6.gz
|
||||||
mkdir -p $PKG/usr/doc/xgames-$VERSION/xroach
|
mkdir -p $PKG/usr/doc/xgames-$VERSION/xroach
|
||||||
cp -a README.linux $PKG/usr/doc/xgames-$VERSION/xroach
|
cp -a README.linux $PKG/usr/doc/xgames-$VERSION/xroach
|
||||||
|
|
||||||
# Build xsnow:
|
|
||||||
cd $TMP
|
|
||||||
tar xvf $CWD/xsnow-1.42.tar.gz || exit 1
|
|
||||||
cd xsnow-1.42 || exit 1
|
|
||||||
xmkmf
|
|
||||||
make $NUMJOBS || make || exit 1
|
|
||||||
cat xsnow > $PKG/usr/bin/xsnow
|
|
||||||
cat xsnow.man | gzip -9c > $PKG/usr/man/man6/xsnow.6.gz
|
|
||||||
mkdir -p $PKG/usr/doc/xgames-$VERSION/xsnow
|
|
||||||
cp -a README $PKG/usr/doc/xgames-$VERSION/xsnow
|
|
||||||
|
|
||||||
# Fix everything up:
|
# Fix everything up:
|
||||||
chmod 755 $PKG/usr/bin/*
|
chmod 755 $PKG/usr/bin/*
|
||||||
strip $PKG/usr/bin/*
|
strip $PKG/usr/bin/*
|
||||||
|
|
||||||
( cd $PKG/usr/doc
|
( cd $PKG/usr/doc
|
||||||
find . -type f -exec chown root.root {} \+
|
find . -type f -exec chown root.root {} \;
|
||||||
find . -type f -exec chmod 644 {} \+
|
find . -type f -exec chmod 644 {} \;
|
||||||
)
|
)
|
||||||
|
|
||||||
mkdir -p $PKG/install
|
mkdir -p $PKG/install
|
||||||
|
@ -170,4 +160,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||||
|
|
||||||
cd $PKG
|
cd $PKG
|
||||||
/sbin/makepkg -l y -c n $TMP/xgames-$VERSION-$ARCH-$BUILD.txz
|
/sbin/makepkg -l y -c n $TMP/xgames-$VERSION-$ARCH-$BUILD.txz
|
||||||
|
|
||||||
|
|
13
source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch
Normal file
13
source/xap/xscreensaver/clarify-desc-in-xfce-settings.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
diff -Nur xscreensaver-5.45.orig/driver/screensaver-properties.desktop.in xscreensaver-5.45/driver/screensaver-properties.desktop.in
|
||||||
|
--- xscreensaver-5.45.orig/driver/screensaver-properties.desktop.in 2009-10-06 21:26:41.000000000 -0500
|
||||||
|
+++ xscreensaver-5.45/driver/screensaver-properties.desktop.in 2020-12-15 20:12:13.223955366 -0600
|
||||||
|
@@ -2,7 +2,7 @@
|
||||||
|
Exec=xscreensaver-demo
|
||||||
|
Icon=xscreensaver
|
||||||
|
Terminal=false
|
||||||
|
-_Name=Screensaver
|
||||||
|
-_Comment=Change screensaver properties
|
||||||
|
+_Name=XScreenSaver
|
||||||
|
+_Comment=Change XScreenSaver properties
|
||||||
|
Type=Application
|
||||||
|
Categories=Settings;DesktopSettings;Security;X-XFCE;
|
|
@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=xscreensaver
|
PKGNAM=xscreensaver
|
||||||
VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo xscreensaver-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -91,6 +91,10 @@ zcat $CWD/xscreensaver.electricsheep.diff.gz | patch -p1 --verbose --backup --su
|
||||||
# helpful to distributions.
|
# helpful to distributions.
|
||||||
zcat $CWD/xscreensaver.no.expiration.date.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
|
zcat $CWD/xscreensaver.no.expiration.date.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
|
||||||
|
|
||||||
|
# Make the description of the xscreensaver settings be clearly for xscreensaver
|
||||||
|
# as opposed to a generic "screensaver" settings
|
||||||
|
zcat $CWD/clarify-desc-in-xfce-settings.patch.gz | patch -p1 --verbose || exit 1
|
||||||
|
|
||||||
chown -R root:root .
|
chown -R root:root .
|
||||||
find . \
|
find . \
|
||||||
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
||||||
|
|
19
source/xap/xsnow/slack-desc
Normal file
19
source/xap/xsnow/slack-desc
Normal file
|
@ -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 ':'.
|
||||||
|
|
||||||
|
|-----handy-ruler------------------------------------------------------|
|
||||||
|
xsnow: xsnow (let it snow on your desktop)
|
||||||
|
xsnow:
|
||||||
|
xsnow: XSnow brings snow, trees, reindeer, Santa, and birds to your desktop.
|
||||||
|
xsnow:
|
||||||
|
xsnow: Homepage: http://ratrabbit.nl/ratrabbit/xsnow/
|
||||||
|
xsnow:
|
||||||
|
xsnow:
|
||||||
|
xsnow:
|
||||||
|
xsnow:
|
||||||
|
xsnow:
|
||||||
|
xsnow:
|
|
@ -1,9 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Slackware build script for xfce4-mixer
|
# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
||||||
|
|
||||||
# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA
|
|
||||||
# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
|
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use of this script, with or without modification, is
|
# Redistribution and use of this script, with or without modification, is
|
||||||
|
@ -12,7 +9,7 @@
|
||||||
# 1. Redistributions of this script must retain the above copyright
|
# 1. Redistributions of this script must retain the above copyright
|
||||||
# notice, this list of conditions and the following disclaimer.
|
# notice, this list of conditions and the following disclaimer.
|
||||||
#
|
#
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
|
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||||
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
||||||
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
@ -25,35 +22,19 @@
|
||||||
|
|
||||||
cd $(dirname $0) ; CWD=$(pwd)
|
cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=xfce4-mixer
|
PKGNAM=xsnow
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-2_alsa}
|
BUILD=${BUILD:-1}
|
||||||
|
|
||||||
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
case "$( uname -m )" in
|
case "$(uname -m)" in
|
||||||
i?86) ARCH=i586 ;;
|
i?86) ARCH=i586 ;;
|
||||||
arm*) ARCH=arm ;;
|
arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
|
||||||
*) ARCH=$( uname -m ) ;;
|
# Unless $ARCH is already set, use uname -m for all other archs:
|
||||||
|
*) ARCH=$(uname -m) ;;
|
||||||
esac
|
esac
|
||||||
fi
|
export ARCH
|
||||||
|
|
||||||
NUMJOBS=${NUMJOBS:-" -j7 "}
|
|
||||||
|
|
||||||
TMP=${TMP:-/tmp}
|
|
||||||
PKG=$TMP/package-$PKGNAM
|
|
||||||
|
|
||||||
if [ "$ARCH" = "i586" ]; then
|
|
||||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
|
||||||
LIBDIRSUFFIX=""
|
|
||||||
elif [ "$ARCH" = "i686" ]; then
|
|
||||||
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
|
|
||||||
LIBDIRSUFFIX=""
|
|
||||||
elif [ "$ARCH" = "x86_64" ]; then
|
|
||||||
SLKCFLAGS="-O2 -fPIC"
|
|
||||||
LIBDIRSUFFIX="64"
|
|
||||||
else
|
|
||||||
SLKCFLAGS="-O2"
|
|
||||||
LIBDIRSUFFIX=""
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
|
||||||
|
@ -64,62 +45,89 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
|
||||||
|
|
||||||
|
if [ "$ARCH" = "i586" ]; then
|
||||||
|
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
||||||
|
LIBDIRSUFFIX=""
|
||||||
|
elif [ "$ARCH" = "i686" ]; then
|
||||||
|
SLKCFLAGS="-O2 -march=i686"
|
||||||
|
LIBDIRSUFFIX=""
|
||||||
|
elif [ "$ARCH" = "s390" ]; then
|
||||||
|
SLKCFLAGS="-O2"
|
||||||
|
LIBDIRSUFFIX=""
|
||||||
|
elif [ "$ARCH" = "x86_64" ]; then
|
||||||
|
SLKCFLAGS="-O2 -fPIC"
|
||||||
|
LIBDIRSUFFIX="64"
|
||||||
|
elif [ "$ARCH" = "armv7hl" ]; then
|
||||||
|
SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
|
||||||
|
LIBDIRSUFFIX=""
|
||||||
|
else
|
||||||
|
SLKCFLAGS="-O2"
|
||||||
|
LIBDIRSUFFIX=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
TMP=${TMP:-/tmp}
|
||||||
|
PKG=$TMP/package-$PKGNAM
|
||||||
|
|
||||||
rm -rf $PKG
|
rm -rf $PKG
|
||||||
mkdir -p $TMP $PKG
|
mkdir -p $TMP $PKG
|
||||||
|
|
||||||
cd $TMP
|
cd $TMP
|
||||||
rm -rf $PKGNAM-$VERSION
|
rm -rf $PKGNAM-$VERSION
|
||||||
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
|
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
|
||||||
cd $PKGNAM-$VERSION || exit 1
|
cd $PKGNAM-$VERSION || exit 1
|
||||||
|
|
||||||
chown -R root:root .
|
chown -R root:root .
|
||||||
find . \
|
find . \
|
||||||
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
|
\( -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 \) \
|
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||||
-exec chmod 644 {} \+
|
-exec chmod 644 {} \+
|
||||||
|
|
||||||
zcat $CWD/0001-Make-Unique-support-optional.patch | patch -p1 --verbose || exit 1
|
|
||||||
zcat $CWD/0001-Use-datadir-xfce4-mixer-as-MIXER_DATADIR.patch | patch -p1 --verbose || exit 1
|
|
||||||
zcat $CWD/0001-icons-Makefile.am-Remove-unnecessary-gtk-update-icon.patch | patch -p1 --verbose || exit 1
|
|
||||||
|
|
||||||
xdt-autogen
|
|
||||||
|
|
||||||
|
# Configure, build, and install:
|
||||||
|
if [ ! -r configure ]; then
|
||||||
|
if [ -x ./autogen.sh ]; then
|
||||||
|
NOCONFIGURE=1 ./autogen.sh
|
||||||
|
else
|
||||||
|
autoreconf -vif
|
||||||
|
fi
|
||||||
|
fi
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
CXXFLAGS="$SLKCFLAGS" \
|
CXXFLAGS="$SLKCFLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--libdir=/usr/lib${LIBDIRSUFFIX} \
|
--libdir=/usr/lib${LIBDIRSUFFIX} \
|
||||||
--sysconfdir=/etc/xfce \
|
--sysconfdir=/etc \
|
||||||
--localstatedir=/var \
|
--localstatedir=/var \
|
||||||
--mandir=/usr/man \
|
|
||||||
--docdir=/usr/doc/$PKGNAM-$VERSION \
|
--docdir=/usr/doc/$PKGNAM-$VERSION \
|
||||||
--disable-debug \
|
--mandir=/usr/man \
|
||||||
--disable-unique \
|
--with-x \
|
||||||
--build=$ARCH-slackware-linux || exit 1
|
--build=$ARCH-slackware-linux || exit 1
|
||||||
|
make $NUMJOBS gamesdir=/usr/bin || make gamesdir=/usr/bin || exit 1
|
||||||
|
make install gamesdir=/usr/bin DESTDIR=$PKG || exit 1
|
||||||
|
|
||||||
make $NUMJOBS || make || exit 1
|
# Don't ship .la files:
|
||||||
make install DESTDIR=$PKG || exit 1
|
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
||||||
|
|
||||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
|
# Strip binaries:
|
||||||
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
|
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
|
||||||
|
|
||||||
gzip -9 $PKG/usr/man/man?/*.?
|
# Compress manual pages:
|
||||||
|
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
|
||||||
|
|
||||||
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
|
# Add a documentation directory:
|
||||||
|
mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
|
||||||
cp -a \
|
cp -a \
|
||||||
AUTHORS COPYING* HACKING INSTALL NEWS README* THANKS TODO \
|
AUTHORS* ChangeLog Changes COPYING* NEWS* README* \
|
||||||
$PKG/usr/doc/$PKGNAM-$VERSION
|
$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
|
mkdir -p $PKG/install
|
||||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||||
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
|
|
||||||
|
|
||||||
cd $PKG
|
cd $PKG
|
||||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
1
source/xap/xsnow/xsnow.url
Normal file
1
source/xap/xsnow/xsnow.url
Normal file
|
@ -0,0 +1 @@
|
||||||
|
https://sourceforge.net/projects/xsnow/files/
|
|
@ -0,0 +1,12 @@
|
||||||
|
diff -Nur xfce4-screensaver-0.1.11.orig/data/xfce4-screensaver-preferences.desktop.in xfce4-screensaver-0.1.11/data/xfce4-screensaver-preferences.desktop.in
|
||||||
|
--- xfce4-screensaver-0.1.11.orig/data/xfce4-screensaver-preferences.desktop.in 2020-11-07 06:53:45.000000000 -0600
|
||||||
|
+++ xfce4-screensaver-0.1.11/data/xfce4-screensaver-preferences.desktop.in 2020-12-15 20:16:14.521788731 -0600
|
||||||
|
@@ -1,6 +1,6 @@
|
||||||
|
[Desktop Entry]
|
||||||
|
-_Name=Screensaver
|
||||||
|
-_Comment=Set your screensaver preferences
|
||||||
|
+_Name=xfce4-screensaver
|
||||||
|
+_Comment=Set your xfce4-screensaver preferences
|
||||||
|
Icon=org.xfce.ScreenSaver
|
||||||
|
Exec=xfce4-screensaver-preferences
|
||||||
|
Terminal=false
|
|
@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=xfce4-screensaver
|
PKGNAM=xfce4-screensaver
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
if [ -z "$ARCH" ]; then
|
if [ -z "$ARCH" ]; then
|
||||||
|
@ -82,6 +82,9 @@ find . \
|
||||||
# Revert this one: https://gitlab.xfce.org/apps/xfce4-screensaver/-/issues/66
|
# Revert this one: https://gitlab.xfce.org/apps/xfce4-screensaver/-/issues/66
|
||||||
zcat $CWD/0001-Catch-gs_listener_dbus_init-failures.patch.gz | patch -p1 -R || exit 1
|
zcat $CWD/0001-Catch-gs_listener_dbus_init-failures.patch.gz | patch -p1 -R || exit 1
|
||||||
|
|
||||||
|
# Clarify description in Xfce Settings menu
|
||||||
|
zcat $CWD/clarify-desc-in-xfce-settings.patch.gz | patch -p1 --verbose || exit 1
|
||||||
|
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
CXXFLAGS="$SLKCFLAGS" \
|
CXXFLAGS="$SLKCFLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
|
@ -141,7 +144,6 @@ fi
|
||||||
|
|
||||||
mkdir -p $PKG/install
|
mkdir -p $PKG/install
|
||||||
cat $CWD/slack-desc > $PKG/install/slack-desc
|
cat $CWD/slack-desc > $PKG/install/slack-desc
|
||||||
zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
|
|
||||||
|
|
||||||
cd $PKG
|
cd $PKG
|
||||||
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
|
||||||
|
|
12
source/xfce/xfce4-session/use-xfss-by-default-in-xfce.patch
Normal file
12
source/xfce/xfce4-session/use-xfss-by-default-in-xfce.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff -Nur xfce4-session-4.14.2.orig/settings/xfce4-session.xml xfce4-session-4.14.2/settings/xfce4-session.xml
|
||||||
|
--- xfce4-session-4.14.2.orig/settings/xfce4-session.xml 2019-07-25 17:33:25.000000000 -0500
|
||||||
|
+++ xfce4-session-4.14.2/settings/xfce4-session.xml 2020-12-15 20:27:10.194758457 -0600
|
||||||
|
@@ -3,7 +3,7 @@
|
||||||
|
<channel name="xfce4-session" version="1.0">
|
||||||
|
<property name="general" type="empty">
|
||||||
|
<property name="FailsafeSessionName" type="string" value="Failsafe"/>
|
||||||
|
- <property name="LockCommand" type="string" value=""/>
|
||||||
|
+ <property name="LockCommand" type="string" value="/usr/bin/xfce4-screensaver-command --lock"/>
|
||||||
|
</property>
|
||||||
|
<property name="sessions" type="empty">
|
||||||
|
<property name="Failsafe" type="empty">
|
|
@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
|
||||||
|
|
||||||
PKGNAM=xfce4-session
|
PKGNAM=xfce4-session
|
||||||
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
|
||||||
BUILD=${BUILD:-1}
|
BUILD=${BUILD:-2}
|
||||||
|
|
||||||
# Automatically determine the architecture we're building on:
|
# Automatically determine the architecture we're building on:
|
||||||
MARCH=$( uname -m )
|
MARCH=$( uname -m )
|
||||||
|
@ -80,6 +80,8 @@ find . \
|
||||||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||||
-exec chmod 644 {} \+
|
-exec chmod 644 {} \+
|
||||||
|
|
||||||
|
zcat $CWD/use-xfss-by-default-in-xfce.patch.gz | patch -p1 --verbose || exit 1
|
||||||
|
|
||||||
# Configure:
|
# Configure:
|
||||||
CFLAGS="$SLKCFLAGS" \
|
CFLAGS="$SLKCFLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
|
@ -96,6 +98,10 @@ CFLAGS="$SLKCFLAGS" \
|
||||||
make $NUMJOBS || make || exit 1
|
make $NUMJOBS || make || exit 1
|
||||||
make install DESTDIR=$PKG || exit 1
|
make install DESTDIR=$PKG || exit 1
|
||||||
|
|
||||||
|
# Don't ship the xscreensaver autostart file:
|
||||||
|
rm -f $PKG/etc/xdg/autostart/xscreensaver.desktop
|
||||||
|
rmdir --parents $PKG/etc/xdg/autostart/
|
||||||
|
|
||||||
# Don't ship .la files:
|
# Don't ship .la files:
|
||||||
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue