version bump; remove old

(Portage version: 2.1.10.65/cvs/Linux x86_64)

5 files changed, 26 insertions, 63 deletions

diff --git a/x11-misc/slim/ChangeLog b/x11-misc/slim/ChangeLog
index 23a9c0097542..dba5682cb84c 100644
--- a/x11-misc/slim/ChangeLog
+++ b/x11-misc/slim/ChangeLog
@@ -1,6 +1,14 @@
 # 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.87 2012/06/23 20:25:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/ChangeLog,v 1.88 2012/06/27 16:01:19 axs Exp $
+
+*slim-1.3.4 (27 Jun 2012)
+
+  27 Jun 2012; Ian Stakenvicius <axs@gentoo.org>
+  -files/405579-fix-numlock.patch, -slim-1.3.3.ebuild,
+  -files/slim-1.3.3-xmu-cmakelists.patch, +slim-1.3.4.ebuild,
+  +files/slim-1.3.4-libpng.patch:
+  version bump; remove old
 
   23 Jun 2012; Luca Barbato <lu_zero@gentoo.org> slim-1.3.3.ebuild:
   Tested on efikamx
diff --git a/x11-misc/slim/files/405579-fix-numlock.patch b/x11-misc/slim/files/405579-fix-numlock.patch
deleted file mode 100644
index 1e6ea7ec6176..000000000000
--- a/x11-misc/slim/files/405579-fix-numlock.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- numlock.cpp.orig	2012-03-04 16:21:34.000000000 +0100
-+++ numlock.cpp	2012-03-04 16:24:49.000000000 +0100
-@@ -68,9 +68,11 @@
-         return;
- 
-     if( flag == true )
--        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
--    else
-         XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, mask);
-+    else
-+        XkbLockModifiers ( dpy, XkbUseCoreKbd, mask, 0);
-+
-+    XSync( dpy, false );
- }
- 
- void NumLock::setOn(Display *dpy) {
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
deleted file mode 100644
index 3ce99f242748..000000000000
--- a/x11-misc/slim/files/slim-1.3.3-xmu-cmakelists.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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/files/slim-1.3.4-libpng.patch b/x11-misc/slim/files/slim-1.3.4-libpng.patch
new file mode 100644
index 000000000000..57b39272b620
--- /dev/null
+++ b/x11-misc/slim/files/slim-1.3.4-libpng.patch
@@ -0,0 +1,14 @@
+--- a/image.cpp	2012-06-26 04:20:14.000000000 -0400
++++ b/image.cpp	2012-06-27 11:41:34.000000000 -0400
+@@ -781,7 +781,11 @@
+                                 (png_infopp) NULL);
+     }
+ 
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++    if (setjmp(png_jmpbuf((png_ptr)))) {
++#else
+     if (setjmp(png_ptr->jmpbuf)) {
++#endif
+         goto png_destroy;
+     }
+ 
diff --git a/x11-misc/slim/slim-1.3.3.ebuild b/x11-misc/slim/slim-1.3.4.ebuild
index 4f26ad9bbd2f..4105b8883706 100644
--- a/x11-misc/slim/slim-1.3.3.ebuild
+++ b/x11-misc/slim/slim-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2012/06/23 20:25:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/slim/slim-1.3.4.ebuild,v 1.1 2012/06/27 16:01:19 axs Exp $
 
 EAPI=4
 
@@ -34,9 +34,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
+	epatch "${FILESDIR}"/${PN}-1.3.3-config.diff
+	epatch "${FILESDIR}"/${P}-libpng.patch
 
 	if use elibc_FreeBSD; then
 		sed -i -e 's/"-DHAVE_SHADOW"/"-DNEEDS_BASENAME"/' CMakeLists.txt \
@@ -46,11 +45,6 @@ src_prepare() {
 	if use branding; then
 		sed -i -e 's/  default/  slim-gentoo-simple/' slim.conf || die
 	fi
-
-	# Upstream bug #15287 (still not fixed in codebase)
-	epatch "${FILESDIR}"/15287-fix-pam-authentication-with-pam_unix2.patch
-	# Gentoo bug 405579, Upstream bug #18552
-	epatch "${FILESDIR}"/405579-fix-numlock.patch
 }
 
 src_configure() {