diff options
Diffstat (limited to 'x11-misc/slim')
| -rw-r--r-- | x11-misc/slim/ChangeLog | 10 | ||||
| -rw-r--r-- | x11-misc/slim/files/slim-1.3.6-honour-cflags.patch | 14 | ||||
| -rw-r--r-- | x11-misc/slim/files/slim-1.3.6-lib-linking.patch | 22 | ||||
| -rw-r--r-- | x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch | 13 | ||||
| -rw-r--r-- | x11-misc/slim/slim-1.3.6.ebuild (renamed from x11-misc/slim/slim-1.3.5-r1.ebuild) | 18 |
5 files changed, 70 insertions, 7 deletions
diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog index c8c95316e0a1..bc31bb0a8625 100644 --- a/x11-misc/slim/ChangeLog +++ b/x11-misc/slim/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-misc/slim # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.117 2013/09/26 17:29:13 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.118 2013/10/17 14:02:00 axs Exp $ + +*slim-1.3.6 (17 Oct 2013) + + 17 Oct 2013; Ian Stakenvicius <axs@gentoo.org> + +files/slim-1.3.6-honour-cflags.patch, +files/slim-1.3.6-lib-linking.patch, + +files/slim-1.3.6-strip-systemd-unit-install.patch, +slim-1.3.6.ebuild, + -slim-1.3.5-r1.ebuild: + version bump, remove old 26 Sep 2013; Agostino Sarubbo <ago@gentoo.org> slim-1.3.5-r3.ebuild: Stable for arm, wrt bug #484912 diff --git a/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch new file mode 100644 index 000000000000..8335e0fe9e75 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.6-honour-cflags.patch @@ -0,0 +1,14 @@ +--- CMakeLists.txt 2013-10-01 18:38:05.000000000 -0400 ++++ CMakeLists.txt.new 2013-10-15 11:33:18.975741094 -0400 +@@ -42,11 +42,6 @@ + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DPKGDATADIR=\"${PKGDATADIR}\"") + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DSYSCONFDIR=\"${SYSCONFDIR}\"") + +-# Flags +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O2") +-set(CMAKE_CPP_FLAGS "${CMAKE_CPP_FLAGS} -Wall -g -O2") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -g -O2") +- + # source + set(slim_srcs + main.cpp diff --git a/x11-misc/slim/files/slim-1.3.6-lib-linking.patch b/x11-misc/slim/files/slim-1.3.6-lib-linking.patch new file mode 100644 index 000000000000..ab108982c7a5 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.6-lib-linking.patch @@ -0,0 +1,22 @@ +--- CMakeLists.txt 2013-10-15 11:35:16.688739802 -0400 ++++ CMakeLists.txt.new 2013-10-15 11:53:46.185727620 -0400 +@@ -115,6 +115,7 @@ + message("\tPAM Found") + set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM") + target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY}) ++ target_link_libraries(libslim ${PAM_LIBRARY}) + target_link_libraries(slimlock ${PAM_LIBRARY}) + include_directories(${PAM_INCLUDE_DIR}) + else(PAM_FOUND) +@@ -173,7 +174,10 @@ + ) + + target_link_libraries(libslim +- ${JPEG_LIBRARIES} ++ ${RT_LIB} ++ ${X11_Xft_LIB} ++ ${X11_Xrandr_LIB} ++ ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} + ) + diff --git a/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch new file mode 100644 index 000000000000..f116c5ebc976 --- /dev/null +++ b/x11-misc/slim/files/slim-1.3.6-strip-systemd-unit-install.patch @@ -0,0 +1,13 @@ +--- CMakeLists.txt 2013-10-15 12:02:13.463722050 -0400 ++++ CMakeLists.txt.new 2013-10-17 09:41:41.602917345 -0400 +@@ -238,10 +238,6 @@ + install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/) + # configure + install(FILES slim.conf DESTINATION ${SYSCONFDIR}) +-# systemd service file +-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") +- install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system) +-endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + # themes directory + subdirs(themes) + diff --git a/x11-misc/slim/slim-1.3.5-r1.ebuild b/x11-misc/slim/slim-1.3.6.ebuild index 0d2a070b5272..05108fff1d3c 100644 --- a/x11-misc/slim/slim-1.3.5-r1.ebuild +++ b/x11-misc/slim/slim-1.3.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.5-r1.ebuild,v 1.9 2013/02/12 20:22:30 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.6.ebuild,v 1.1 2013/10/17 14:02:00 axs Exp $ EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="mirror://berlios/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="branding pam consolekit" REQUIRED_USE="consolekit? ( pam )" @@ -22,11 +22,12 @@ RDEPEND="x11-libs/libXmu x11-libs/libXpm x11-libs/libXft media-libs/libpng:0= - virtual/jpeg + virtual/jpeg:= x11-apps/sessreg consolekit? ( sys-auth/consolekit sys-apps/dbus ) - pam? ( virtual/pam )" + pam? ( virtual/pam + !x11-misc/slimlock )" DEPEND="${RDEPEND} virtual/pkgconfig x11-proto/xproto" @@ -35,8 +36,11 @@ PDEPEND="branding? ( >=x11-themes/slim-themes-1.2.3a-r3 )" src_prepare() { # Our Gentoo-specific config changes epatch "${FILESDIR}"/${PN}-1.3.4-config.diff - epatch "${FILESDIR}"/${P}-arm.patch - epatch "${FILESDIR}"/${P}-systemd-service.patch + epatch "${FILESDIR}"/${PN}-1.3.5-arm.patch + epatch "${FILESDIR}"/${P}-honour-cflags.patch + epatch "${FILESDIR}"/${P}-lib-linking.patch + epatch "${FILESDIR}"/${PN}-1.3.5-disable-ck-for-systemd.patch + epatch "${FILESDIR}"/${P}-strip-systemd-unit-install.patch if use elibc_FreeBSD; then sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \ @@ -64,6 +68,8 @@ src_install() { pamd_mimic system-local-login slim auth account session fi + systemd_dounit slim.service + insinto /usr/share/slim newins "${FILESDIR}/Xsession-r3" Xsession |