diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-10-15 00:31:49 -0300 |
commit | 93db7f2fb23cba78cde4343b506a676e376ca4a8 (patch) | |
tree | 3fec56215a344b1e01e49a27198f919ac981320b /community/lightdm-kde-greeter | |
parent | c162e34d12c6cf76532a7f6b3d538d493a8bf17a (diff) | |
parent | 39e9111d76d232d65ca0c43285dea5bd5d58d28e (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avant-window-navigator/PKGBUILD
community/awn-extras-applets/PKGBUILD
community/cinnamon-control-center/PKGBUILD
community/gnome-menus2/PKGBUILD
community/gnome-panel/PKGBUILD
community/gpsim/PKGBUILD
community/kgraphviewer/PKGBUILD
community/kpovmodeler/PKGBUILD
community/libdesktop-agnostic/PKGBUILD
community/python-basemap/PKGBUILD
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
community/qgo/PKGBUILD
community/ude/PKGBUILD
community/virtkey/PKGBUILD
extra/alsaplayer/PKGBUILD
extra/aterm/PKGBUILD
extra/cups-pdf/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gtk2/PKGBUILD
extra/kdeplasma-applets-networkmanagement/PKGBUILD
extra/libffado/PKGBUILD
extra/libtar/PKGBUILD
extra/maxima/PKGBUILD
extra/php-xcache/PKGBUILD
extra/postgresql/PKGBUILD
extra/xorg-server/PKGBUILD
extra/xorg-xauth/PKGBUILD
Diffstat (limited to 'community/lightdm-kde-greeter')
-rwxr-xr-x | community/lightdm-kde-greeter/PKGBUILD | 18 | ||||
-rw-r--r-- | community/lightdm-kde-greeter/findlightdm.patch | 33 |
2 files changed, 46 insertions, 5 deletions
diff --git a/community/lightdm-kde-greeter/PKGBUILD b/community/lightdm-kde-greeter/PKGBUILD index aea2722d5..ffd609c31 100755 --- a/community/lightdm-kde-greeter/PKGBUILD +++ b/community/lightdm-kde-greeter/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90484 2013-05-12 21:57:59Z alucryd $ +# $Id: PKGBUILD 98490 2013-10-11 19:21:24Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Mladen Pejakovic <pejakm@gmail.com> @@ -6,7 +6,7 @@ pkgname=lightdm-kde-greeter pkgver=0.3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="KDE greeter for LightDM" arch=('i686' 'x86_64' 'mips64el') url="https://projects.kde.org/projects/playground/base/lightdm" @@ -16,24 +16,32 @@ makedepends=('cmake' 'automoc4') backup=('etc/lightdm/lightdm-kde-greeter.conf' 'etc/dbus-1/system.d/org.kde.kcontrol.kcmlightdm.conf') source=("ftp://ftp.kde.org/pub/kde/unstable/${pkgname%-*}/src/${pkgname%-*}-${pkgver}.tar.bz2" + 'findlightdm.patch' 'lightdm-kde-greeter.conf') sha256sums=('65b2a1bab2c88bf55a07e62cbe0eb8ac3660638636c5825e5925b28d03f12188' + '9a042204df841f93a817c0613284bb09006e5dc4af910648025e7ab1bb56e114' 'a8fe10ef68d553781b91b1377106f95915c3ca14d835bd66910e08f922ef64c8') +prepare() { + cd lightdm-${pkgver} + + patch -Np1 -i ../findlightdm.patch +} + build() { - cd "${srcdir}"/lightdm-${pkgver} + cd lightdm-${pkgver} if [[ -d build ]]; then rm -rf build fi mkdir build && cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr + cmake .. -DCMAKE_INSTALL_PREFIX='/usr' make } package() { - cd "${srcdir}"/lightdm-${pkgver}/build + cd lightdm-${pkgver}/build make DESTDIR="${pkgdir}" install mv "${pkgdir}"/usr/{sbin,bin} diff --git a/community/lightdm-kde-greeter/findlightdm.patch b/community/lightdm-kde-greeter/findlightdm.patch new file mode 100644 index 000000000..564dc3f84 --- /dev/null +++ b/community/lightdm-kde-greeter/findlightdm.patch @@ -0,0 +1,33 @@ +--- a/cmake/modules/FindQLightDM.cmake ++++ b/cmake/modules/FindQLightDM.cmake +@@ -19,10 +19,19 @@ + find_package(PkgConfig) + if(PKG_CONFIG_FOUND) + if (QLIGHTDM_MIN_VERSION) +- PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION}) ++ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3>=${QLIGHTDM_MIN_VERSION}) + else (QLIGHTDM_MIN_VERSION) +- PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2) ++ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-3) + endif (QLIGHTDM_MIN_VERSION) ++ SET (QLIGHTDM_API 3) ++ if (NOT PC_QLIGHTDM_FOUND) ++ if (QLIGHTDM_MIN_VERSION) ++ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2>=${QLIGHTDM_MIN_VERSION}) ++ else (QLIGHTDM_MIN_VERSION) ++ PKG_CHECK_MODULES(PC_QLIGHTDM liblightdm-qt-2) ++ endif (QLIGHTDM_MIN_VERSION) ++ SET (QLIGHTDM_API 2) ++ endif (NOT PC_QLIGHTDM_FOUND) + endif(PKG_CONFIG_FOUND) + + +@@ -34,7 +43,7 @@ + ) + + find_library(QLIGHTDM_LIBRARIES +- NAMES lightdm-qt-2 ++ NAMES lightdm-qt-${QLIGHTDM_API} + HINTS + ${PC_QLIGHTDM_LIBDIR} + ${PC_QLIGHTDM_LIBRARY_DIRS} |