Attachment 130835 Details for Bug 174847 – file.diff

[patch] file.diff

file.diff (text/plain), 2.43 KB, created by Herbert J. Skuhra on 2012-12-31 01:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Herbert J. Skuhra

Created: 2012-12-31 01:50:00 UTC

Size: 2.43 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 309701)
>+++ Makefile	(working copy)
>@@ -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 @@
> 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 @@
> 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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 309701)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-src_x11.cc
>===================================================================
>--- files/patch-src_x11.cc	(revision 0)
>+++ files/patch-src_x11.cc	(working copy)
>@@ -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;

Actions: View | Diff

Attachments on bug 174847: 130835