- update to 0.1.16

- add a patch to fix complication with our old gcc 4.2.1

PR:		ports/174847
Submitted by:	"Herbert J. Skuhra" <h.skuhra@gmail.com>
This commit is contained in:
Baptiste Daroussin 2012-12-31 11:18:17 +00:00
parent 9b3f7519c3
commit e46535026b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=309715
3 changed files with 30 additions and 15 deletions

View File

@ -1,12 +1,8 @@
# Ports collection makefile for: pekwm
# Date created: Nov 1, 2002
# Whom: anders@hack.org
#
# Created by: anders@hack.org
# $FreeBSD$
#
PORTNAME= pekwm
PORTVERSION= 0.1.15
PORTVERSION= 0.1.16
PORTEPOCH= 1
CATEGORIES= x11-wm
MASTER_SITES= http://pekwm.org/projects/3/files/
@ -14,7 +10,7 @@ MASTER_SITES= http://pekwm.org/projects/3/files/
MAINTAINER= bapt@FreeBSD.org
COMMENT= Light, Unobtrusive, and configurable windowmanager
LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png
USE_XORG= xft xpm x11
@ -32,10 +28,4 @@ LDFLAGS+= -L${LOCALBASE}/lib -liconv
MAN1= pekwm.1
MANCOMPRESSED= no
# replace calls to obsolete libpng12 functions
post-extract:
@${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|; \
s|png_check_sig(sig, PImageLoaderPng::PNG_SIG_BYTES) !=|png_sig_cmp(sig, 0, PImageLoaderPng::PNG_SIG_BYTES) ==|' \
${WRKSRC}/src/PImageLoaderPng.cc
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (pekwm-0.1.15.tar.bz2) = 56d405b87f3d858ebc53a227e4de23b9273067707251145c90af08d35bc7582f
SIZE (pekwm-0.1.15.tar.bz2) = 395557
SHA256 (pekwm-0.1.16.tar.bz2) = 899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96
SIZE (pekwm-0.1.16.tar.bz2) = 401550

View File

@ -0,0 +1,25 @@
--- src/x11.cc.orig 2012-12-31 01:07:34.000000000 +0100
+++ src/x11.cc 2012-12-31 01:11:01.000000000 +0100
@@ -993,6 +993,8 @@
/**
* Wrapper for XKeycodeToKeysym and XkbKeycodeToKeysym depending on which one is available.
*/
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
KeySym
X11::getKeysymFromKeycode(KeyCode keycode)
{
@@ -1001,12 +1003,9 @@
return XkbKeycodeToKeysym(_dpy, keycode, 0, 0);
else
#endif
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
return XKeycodeToKeysym(_dpy, keycode, 0);
-#pragma GCC diagnostic pop
}
+#pragma GCC diagnostic pop
Display *X11::_dpy;
bool X11::_honour_randr = false;