Date: Tuesday, August 11, 2015 @ 08:59:32 Author: fyan Revision: 243146
upgpkg: sddm 0.11.0-2 add patch from kubuntu to rename org.freedesktop.DisplayManager.conf (FS#42445) Added: sddm/trunk/kubuntu_dbus-config-rename.patch Modified: sddm/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 15 +++++++++++---- kubuntu_dbus-config-rename.patch | 13 +++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-08-11 06:41:54 UTC (rev 243145) +++ PKGBUILD 2015-08-11 06:59:32 UTC (rev 243146) @@ -1,9 +1,10 @@ # $Id$ -# Maintainer: Andrea Scarpino <[email protected]> +# Maintainer: Felix Yan <[email protected]> +# Contributor: Andrea Scarpino <[email protected]> pkgname=sddm pkgver=0.11.0 -pkgrel=1 +pkgrel=2 pkgdesc='QML based X11 display manager' arch=('i686' 'x86_64') url='http://github.com/sddm/sddm' @@ -14,11 +15,17 @@ backup=('usr/share/sddm/scripts/Xsetup') conflicts=('display-manager') provides=('display-manager') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz";) -md5sums=('e110a7683867400dc9484d4744fd41dd') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"; + kubuntu_dbus-config-rename.patch) +md5sums=('e110a7683867400dc9484d4744fd41dd' + '7c2934003e61c46d1d82d3d9a93ed35b') prepare() { mkdir -p build + + cd $pkgname-$pkgver + # FS#42445 + patch -p1 -i ../kubuntu_dbus-config-rename.patch } build() { Added: kubuntu_dbus-config-rename.patch =================================================================== --- kubuntu_dbus-config-rename.patch (rev 0) +++ kubuntu_dbus-config-rename.patch 2015-08-11 06:59:32 UTC (rev 243146) @@ -0,0 +1,13 @@ +Index: sddm-0.1.0+git20140718/data/CMakeLists.txt +=================================================================== +--- sddm-0.1.0+git20140718.orig/data/CMakeLists.txt 2014-07-18 11:36:58.974892509 +0200 ++++ sddm-0.1.0+git20140718/data/CMakeLists.txt 2014-07-18 11:36:58.970892509 +0200 +@@ -1,7 +1,7 @@ + install(DIRECTORY "faces" DESTINATION "${DATA_INSTALL_DIR}") + install(DIRECTORY "flags" DESTINATION "${DATA_INSTALL_DIR}") + +-install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}") ++install(FILES "org.freedesktop.DisplayManager.conf" DESTINATION "${DBUS_CONFIG_DIR}" RENAME sddm_org.freedesktop.DisplayManager.conf) + + install(FILES "scripts/Xsession" "scripts/Xsetup" DESTINATION "${DATA_INSTALL_DIR}/scripts" + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
