diff options
| -rw-r--r-- | pcr/sddm-consolekit/PKGBUILD | 15 | ||||
| -rw-r--r-- | pcr/sddm-consolekit/sddm-respect-user-flags.patch | 26 | ||||
| -rw-r--r-- | pcr/sddm-consolekit/sddm-upower.patch | 12 |
3 files changed, 34 insertions, 19 deletions
diff --git a/pcr/sddm-consolekit/PKGBUILD b/pcr/sddm-consolekit/PKGBUILD index 7252cab46..924369fc0 100644 --- a/pcr/sddm-consolekit/PKGBUILD +++ b/pcr/sddm-consolekit/PKGBUILD @@ -1,11 +1,11 @@ -# Maintainer : freaj <freaj@riseup.net> -# Maintainer (Manjaro): artoo <artoo@manjaro.org> +# Maintainer (Manjaro): artoo <artoo@manjaro.org> # Contributor (Manjaro): Andrea Scarpino <andrea@archlinux.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _pkgname=sddm pkgname=sddm-consolekit -pkgver=0.11.0 +pkgver=0.12.0 pkgrel=1 pkgdesc='QML based X11 display manager' arch=('i686' 'x86_64') @@ -19,16 +19,16 @@ conflicts=('display-manager' 'sddm') provides=('display-manager' 'sddm') source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/v${pkgver}.tar.gz" "${_pkgname}-consolekit.patch" - "${_pkgname}-upower.patch") -sha256sums=('80d53f075c275f744bd547523d6d640baccfacb4e463a71ec0facb8231b832ce' + "${_pkgname}-respect-user-flags.patch") +sha256sums=('5027db5185d92ac5e5e547c7ba29693876ae3f0936d21fccbdd49af88aa1e89d' '4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5' - '6a2efbc0cd65d8f63a3f1288051001b18da5d00f5ce0ddbac1656a69c3a1a29f') + 'a123cdc2e3337878b23e79b03ee54f859af5f8895dd2d9f80094780b3f5108bf') prepare() { mkdir -p build cd ${_pkgname}-${pkgver} patch -p1 -i ${srcdir}/${_pkgname}-consolekit.patch - patch -p1 -i ${srcdir}/${_pkgname}-upower.patch + patch -p0 -i ${srcdir}/${_pkgname}-respect-user-flags.patch } build() { @@ -37,6 +37,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/sddm \ + -DDBUS_CONFIG_FILENAME=org.freedesktop.sddm.conf \ -DBUILD_MAN_PAGES=ON make } diff --git a/pcr/sddm-consolekit/sddm-respect-user-flags.patch b/pcr/sddm-consolekit/sddm-respect-user-flags.patch new file mode 100644 index 000000000..67a662186 --- /dev/null +++ b/pcr/sddm-consolekit/sddm-respect-user-flags.patch @@ -0,0 +1,26 @@ +diff -u CMakeLists.txt CMakeLists.txt +--- CMakeLists.txt 2015-09-05 22:40:50.000000000 +0200 ++++ CMakeLists.txt 2015-09-07 12:15:33.419530808 +0200 +@@ -35,22 +35,6 @@ + # Definitions + add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII) + +-# Default build type +-if(NOT CMAKE_BUILD_TYPE) +- set(CMAKE_BUILD_TYPE Release) +-endif() +- +-# Handle build type +-if(CMAKE_BUILD_TYPE MATCHES [Dd]ebug) +- message(STATUS "Debug build") +- add_definitions(-DDEBUG) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") +-else() +- message(STATUS "Release build") +- add_definitions(-DNDEBUG) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2") +-endif() +- + # Default absolute paths + if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR) + set(CMAKE_INSTALL_SYSCONFDIR "/etc") diff --git a/pcr/sddm-consolekit/sddm-upower.patch b/pcr/sddm-consolekit/sddm-upower.patch deleted file mode 100644 index 8c0f34c27..000000000 --- a/pcr/sddm-consolekit/sddm-upower.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp sddm-0.9.0/src/daemon/PowerManager.cpp ---- sddm-0.9.0.orig/src/daemon/PowerManager.cpp 2014-10-01 18:40:37.402683578 +0200 -+++ sddm-0.9.0/src/daemon/PowerManager.cpp 2014-10-01 18:40:43.502618164 +0200 -@@ -197,7 +197,7 @@ - m_backends << new Login1Backend(); - - // check if upower interface exists -- if (interface->isServiceRegistered(UPOWER_SERVICE)) -+// if (interface->isServiceRegistered(UPOWER_SERVICE)) - m_backends << new UPowerBackend(); - } - |