Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=0cdfad358a68165b525ff7097b036b4af73b9b81
commit 0cdfad358a68165b525ff7097b036b4af73b9b81 Author: crazy <[email protected]> Date: Fri Sep 29 12:58:41 2017 +0200 gnome-settings-daemon-3.26.0-2-x86_64 * fix udev rules location by patching no options to change that from build system diff --git a/source/gnome/gnome-settings-daemon/FrugalBuild b/source/gnome/gnome-settings-daemon/FrugalBuild index eead365..eefb6fc 100644 --- a/source/gnome/gnome-settings-daemon/FrugalBuild +++ b/source/gnome/gnome-settings-daemon/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gnome-settings-daemon pkgver=3.26.0 -pkgrel=1 +pkgrel=2 pkgdesc="Utility library for accessing gnome-settings-daemon over DBUS" depends=('libxml2>=2.9.4-3' 'gnome-desktop>=3.26.0' 'libxxf86misc>=1.0.3-3' 'gst1-plugins-base>=1.12.2-2' 'pulseaudio>=9.0-2' \ 'libgnomekbd>=3.26.0' 'libnotify' 'libcanberra-gtk>=0.30-16' 'libcanberra-pulseaudio' 'gsettings-desktop-schemas>=3.24.1-2' \ @@ -20,11 +20,11 @@ _F_gnome_doc="n" _F_gnome_devel="n" _F_gnome_ext=".tar.xz" Finclude gnome gnome-scriptlet -sha1sums=('114cab2802bfe40c84a34f5de962815c1afdf0d5') +source+=(udev-rules-location.patch) +sha1sums=('114cab2802bfe40c84a34f5de962815c1afdf0d5' \ + '718289382f1706df776261aca9a1315b5741a3fc') -Fconfopts="${Fconfopts[@]} --disable-static \ - --disable-schemas-compile \ - --enable-systemd" +Fconfopts+=" --disable-static --disable-schemas-compile --enable-systemd" build() { Fcd @@ -32,7 +32,7 @@ build() { Fbuild_gnome_scriptlet Fmkdir etc/profile.d echo 'export GSETTINGS_BACKEND="dconf"' > $Fdestdir/etc/profile.d/gsettings-dconf.sh - chmod +x $Fdestdir/etc/profile.d/gsettings-dconf.sh || Fdie + Fexec chmod +x $Fdestdir/etc/profile.d/gsettings-dconf.sh || Fdie #_F_gnome_split_doc } diff --git a/source/gnome/gnome-settings-daemon/udev-rules-location.patch b/source/gnome/gnome-settings-daemon/udev-rules-location.patch new file mode 100644 index 0000000..83e4ca9 --- /dev/null +++ b/source/gnome/gnome-settings-daemon/udev-rules-location.patch @@ -0,0 +1,24 @@ +diff -Naur gnome-settings-daemon-3.26.0/plugins/rfkill/Makefile.am gnome-settings-daemon-3.26.0-p/plugins/rfkill/Makefile.am +--- gnome-settings-daemon-3.26.0/plugins/rfkill/Makefile.am 2017-09-01 14:12:11.000000000 +0200 ++++ gnome-settings-daemon-3.26.0-p/plugins/rfkill/Makefile.am 2017-09-29 12:51:14.749699260 +0200 +@@ -30,7 +30,7 @@ + org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile + $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + +-udevrulesdir = $(prefix)/lib/udev/rules.d ++udevrulesdir = /lib/udev/rules.d + udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules + + EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files) +diff -Naur gnome-settings-daemon-3.26.0/plugins/rfkill/Makefile.in gnome-settings-daemon-3.26.0-p/plugins/rfkill/Makefile.in +--- gnome-settings-daemon-3.26.0/plugins/rfkill/Makefile.in 2017-09-11 20:15:46.000000000 +0200 ++++ gnome-settings-daemon-3.26.0-p/plugins/rfkill/Makefile.in 2017-09-29 12:51:14.754699395 +0200 +@@ -472,7 +472,7 @@ + desktopdir = $(sysconfdir)/xdg/autostart + desktop_in_files = org.gnome.SettingsDaemon.Rfkill.desktop.in + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +-udevrulesdir = $(prefix)/lib/udev/rules.d ++udevrulesdir = /lib/udev/rules.d + udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules + EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files) + CLEANFILES = $(desktop_DATA) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
