diff --git a/srcpkgs/xsettingsd/patches/scons.patch b/srcpkgs/xsettingsd/patches/scons.patch index 626de008dd..bedffd5aae 100644 --- a/srcpkgs/xsettingsd/patches/scons.patch +++ b/srcpkgs/xsettingsd/patches/scons.patch @@ -1,14 +1,10 @@ -diff --git SConstruct SConstruct -index 4254271..c81e5ae 100644 ---- SConstruct +--- SConstruct.orig +++ SConstruct -@@ -44,7 +44,8 @@ env = Environment( - env.Append(CPPFLAGS=os.environ.get('CPPFLAGS', ''), - CFLAGS=os.environ.get('CFLAGS', ''), - CXXFLAGS=os.environ.get('CXXFLAGS', ''), -- LDFLAGS=os.environ.get('LDFLAGS', '')) -+ LINKFLAGS=os.environ.get('LDFLAGS', '')) -+env.Replace(CXX=os.environ.get("CXX", "")) - +@@ -48,6 +48,7 @@ + env.Append(CCFLAGS='-Wall -Werror -Wno-narrowing') - + ++env.Replace(CXX=os.environ.get('CXX', '')) + + srcs = Split('''\ + common.cc diff --git a/srcpkgs/xsettingsd/template b/srcpkgs/xsettingsd/template index 17c7c5737d..b2c1a1d95a 100644 --- a/srcpkgs/xsettingsd/template +++ b/srcpkgs/xsettingsd/template @@ -1,9 +1,7 @@ # Template file for 'xsettingsd' pkgname=xsettingsd -version=0.0.20160524 +version=1.0.0 revision=1 -_git_ref=b4999f5e9e99224caf97d09f25ee731774ecd7be -wrksrc=$pkgname-$_git_ref build_style=scons hostmakedepends="scons pkg-config libX11-devel" makedepends="libX11-devel" @@ -11,8 +9,8 @@ short_desc="Daemon that implements the XSETTINGS specification" maintainer="Duncaen " license="3-clause-BSD" homepage="https://github.com/derat/xsettingsd" -distfiles="https://github.com/derat/xsettingsd/archive/${_git_ref}.tar.gz" -checksum=16c14ce201d71f5ca66477cfcc276874e3af8d1bc3bb01cd04059ca9757c4449 +distfiles="https://github.com/derat/xsettingsd/archive/v${version}.tar.gz" +checksum="fe0b895b999af94004dc2eabe6dd113c475e3464d548cfe4e545fc02978ba977" do_install() { vbin xsettingsd