diff options
| author |   Ian Stakenvicius <axs@gentoo.org> | 2012-05-10 15:35:08 +0000 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2012-05-10 15:35:08 +0000 |
| commit | 34dc8f041ca027fed609f40792474d0523dc1d54 (patch) | |
| tree | e6ae62d2c7defb8f69a7f50b215e3b4d38ae3625 /x11-misc/slim | |
| parent | Remove old (diff) | |
| download | gentoo-2-34dc8f041ca027fed609f40792474d0523dc1d54.tar.gz gentoo-2-34dc8f041ca027fed609f40792474d0523dc1d54.tar.bz2 gentoo-2-34dc8f041ca027fed609f40792474d0523dc1d54.zip | |
Fixed CMake check to find libXmu via X11 instead of GLUT, bug 414891
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/slim')
| -rw-r--r-- | x11-misc/slim/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/slim/files/slim-1.3.3-xmu-cmakelists.patch | 37 | ||||
| -rw-r--r-- | x11-misc/slim/slim-1.3.3.ebuild | 5 |
3 files changed, 46 insertions, 2 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index 008083aa309f..76326152db4c 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/slim # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.84 2012/05/05 04:53:46 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.85 2012/05/10 15:35:08 axs Exp $ + + 10 May 2012; Ian Stakenvicius <axs@gentoo.org> slim-1.3.3.ebuild, + +files/slim-1.3.3-xmu-cmakelists.patch: + Fixed CMake check to find libXmu via X11 instead of GLUT, bug 414891 05 May 2012; Jeff Horelick <jdhore@gentoo.org> slim-1.3.2-r7.ebuild, slim-1.3.3.ebuild: diff --git a/x11-misc/slim/files/slim-1.3.3-xmu-cmakelists.patch b/x11-misc/slim/files/slim-1.3.3-xmu-cmakelists.patch new file mode 100644 index 000000000000..3ce99f242748 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.3-xmu-cmakelists.patch @@ -0,0 +1,37 @@ +--- slim-1.3.3/CMakeLists.txt 2012-02-21 18:59:52.000000000 -0500 ++++ slim-1.3.3/CMakeLists.txt 2012-05-10 11:22:51.000000000 -0400 +@@ -18,7 +18,7 @@ + # Version + set(SLIM_VERSION_MAJOR "1") + set(SLIM_VERSION_MINOR "3") +-set(SLIM_VERSION_PATCH "2") ++set(SLIM_VERSION_PATCH "3") # apparently upstream didn't bump this + set(SLIM_VERSION "${SLIM_VERSION_MAJOR}.${SLIM_VERSION_MINOR}.${SLIM_VERSION_PATCH}") + + set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation Directory") +@@ -73,7 +73,6 @@ + + find_package(X11 REQUIRED) + find_package(Freetype REQUIRED) +-find_package(GLUT REQUIRED) + find_package(JPEG REQUIRED) + find_package(PNG REQUIRED) + find_package(ZLIB REQUIRED) +@@ -143,7 +142,7 @@ + ${X11_Xft_INCLUDE_PATH} + ${X11_Xrender_INCLUDE_PATH} + ${FREETYPE_INCLUDE_DIR_freetype2} +- ${GLUT_Xmu_INCLUDE_PATH} ++ ${X11_Xmu_INCLUDE_PATH} + ${ZLIB_INCLUDE_DIR} + ${JPEG_INCLUDE_DIR} + ${PNG_INCLUDE_DIR} +@@ -158,7 +157,7 @@ + ${X11_Xft_LIB} + ${X11_Xrender_LIB} + ${FREETYPE_LIBRARY} +- ${GLUT_Xmu_LIBRARY} ++ ${X11_Xmu_LIB} + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ) diff --git a/x11-misc/slim/slim-1.3.3.ebuild b/x11-misc/slim/slim-1.3.3.ebuild index c10afddbcad7..41f00564a4ca 100644 --- a/x11-misc/slim/slim-1.3.3.ebuild +++ b/x11-misc/slim/slim-1.3.3.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.3.ebuild,v 1.3 2012/05/05 04:53:46 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.3.ebuild,v 1.4 2012/05/10 15:35:08 axs Exp $ EAPI=4 +CMAKE_MIN_VERSION="2.8.8" inherit cmake-utils pam eutils DESCRIPTION="Simple Login Manager" @@ -34,6 +35,8 @@ PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" src_prepare() { # Our Gentoo-specific config changes epatch "${FILESDIR}"/${P}-config.diff + # Bug 414891 + epatch "${FILESDIR}"/${P}-xmu-cmakelists.patch if use elibc_FreeBSD; then sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ |