diff options
| -rw-r--r-- | pcr/sddm-consolekit/PKGBUILD | 38 | ||||
| -rw-r--r-- | pcr/sddm-consolekit/sddm-respect-user-flags.patch | 26 |
2 files changed, 18 insertions, 46 deletions
diff --git a/pcr/sddm-consolekit/PKGBUILD b/pcr/sddm-consolekit/PKGBUILD index 924369fc0..e2c3ca2f8 100644 --- a/pcr/sddm-consolekit/PKGBUILD +++ b/pcr/sddm-consolekit/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=sddm pkgname=sddm-consolekit -pkgver=0.12.0 +pkgver=0.13.0 pkgrel=1 pkgdesc='QML based X11 display manager' arch=('i686' 'x86_64') @@ -18,31 +18,29 @@ backup=('usr/share/sddm/scripts/Xsetup') 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}-respect-user-flags.patch") -sha256sums=('5027db5185d92ac5e5e547c7ba29693876ae3f0936d21fccbdd49af88aa1e89d' - '4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5' - 'a123cdc2e3337878b23e79b03ee54f859af5f8895dd2d9f80094780b3f5108bf') + "${_pkgname}-consolekit.patch") +sha256sums=('26dee7e59859b5cbd5ec26b0050ef31c32b43be304e4042119819ab9779c26bd' + '4cbe522c84956d13d751856b8c66f2beca210c9ec65712e261bfe2bf94fb0da5') prepare() { - mkdir -p build - cd ${_pkgname}-${pkgver} - patch -p1 -i ${srcdir}/${_pkgname}-consolekit.patch - patch -p0 -i ${srcdir}/${_pkgname}-respect-user-flags.patch + mkdir -p build + cd ${_pkgname}-${pkgver} + patch -p1 -i ${srcdir}/${_pkgname}-consolekit.patch } build() { - cd build - cmake ../${_pkgname}-${pkgver} \ - -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 + cd build + cmake ../${_pkgname}-${pkgver} \ + -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 } package() { - cd build - make DESTDIR="${pkgdir}" install + cd build + make DESTDIR="${pkgdir}" install + sed -e 's|pam_systemd.so|pam_ck_connector.so nox11|' -i ${pkgdir}/etc/pam.d/sddm-greeter } diff --git a/pcr/sddm-consolekit/sddm-respect-user-flags.patch b/pcr/sddm-consolekit/sddm-respect-user-flags.patch deleted file mode 100644 index 67a662186..000000000 --- a/pcr/sddm-consolekit/sddm-respect-user-flags.patch +++ /dev/null @@ -1,26 +0,0 @@ -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") |