[arch-commits] Commit in sddm/trunk (PKGBUILD kubuntu_dbus-config-rename.patch)

[Felix Yan]

    Date: Tuesday, September 8, 2015 @ 08:50:25
  Author: fyan
Revision: 245511

upgpkg: sddm 0.12.0-1

Modified:
  sddm/trunk/PKGBUILD
Deleted:
  sddm/trunk/kubuntu_dbus-config-rename.patch

----------------------------------+
 PKGBUILD                         |   15 +++++----------
 kubuntu_dbus-config-rename.patch |   13 -------------
 2 files changed, 5 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-08 02:03:13 UTC (rev 245510)
+++ PKGBUILD	2015-09-08 06:50:25 UTC (rev 245511)
@@ -3,8 +3,8 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=sddm
-pkgver=0.11.0
-pkgrel=3
+pkgver=0.12.0
+pkgrel=1
 pkgdesc='QML based X11 display manager'
 arch=('i686' 'x86_64')
 url='http://github.com/sddm/sddm'
@@ -14,17 +14,11 @@
 install="${pkgname}.install"
 backup=('usr/share/sddm/scripts/Xsetup')
 provides=('display-manager')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz"
-        kubuntu_dbus-config-rename.patch)
-md5sums=('e110a7683867400dc9484d4744fd41dd'
-         '7c2934003e61c46d1d82d3d9a93ed35b')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz")
+md5sums=('e3261ac93a50c71c973cc79b85387765')
 
 prepare() {
   mkdir -p build
-
-  cd $pkgname-$pkgver
-  # FS#42445
-  patch -p1 -i ../kubuntu_dbus-config-rename.patch
 }
 
 build() {
@@ -33,6 +27,7 @@
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \
+        -DDBUS_CONFIG_FILENAME=sddm_org.freedesktop.DisplayManager.conf \
         -DBUILD_MAN_PAGES=ON
   make
 }

Deleted: kubuntu_dbus-config-rename.patch
===================================================================
--- kubuntu_dbus-config-rename.patch	2015-09-08 02:03:13 UTC (rev 245510)
+++ kubuntu_dbus-config-rename.patch	2015-09-08 06:50:25 UTC (rev 245511)
@@ -1,13 +0,0 @@
-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