Update to 0.1.17 [1]

Add a patch to prevent pekwm_screenshot.sh script to depend on bash

Submitted by:	Claes Nasten <me@pekdon.net> (upstream) [1]
This commit is contained in:
Baptiste Daroussin 2013-06-25 11:50:20 +00:00
parent 2afeb52a09
commit dcae21f5b2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=321734
5 changed files with 71 additions and 30 deletions

View file

@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= pekwm
PORTVERSION= 0.1.16
PORTEPOCH= 1
PORTVERSION= 0.1.17
CATEGORIES= x11-wm
MASTER_SITES= http://pekwm.org/projects/3/files/
MASTER_SITES= https://pekwm.org/projects/3/files/
MAINTAINER= bapt@FreeBSD.org
COMMENT= Light, Unobtrusive, and configurable windowmanager

View file

@ -1,2 +1,2 @@
SHA256 (pekwm-0.1.16.tar.bz2) = 899eef35d5d1f472dd65a08c180b9719935cb1f42eda7fada6f9b8b551c79c96
SIZE (pekwm-0.1.16.tar.bz2) = 401550
SHA256 (pekwm-0.1.17.tar.bz2) = 8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00
SIZE (pekwm-0.1.17.tar.bz2) = 405742

View file

@ -0,0 +1,66 @@
--- ./data/scripts/pekwm_screenshot.sh.orig 2013-05-26 14:01:18.000000000 +0200
+++ ./data/scripts/pekwm_screenshot.sh 2013-06-25 13:38:36.617834517 +0200
@@ -1,30 +1,30 @@
-#!/usr/bin/env bash
+#!/bin/sh
#
# Copyright © 2013 the pekwm development team
#
-function screenshot_scrot
+screenshot_scrot()
{
scrot -z "$1"
}
-function screenshot_xwd_netpbm
+screenshot_xwd_netpbm()
{
xwd -root | xwdtopnm 2>/dev/null | pnmtopng > "$1"
}
-function screenshot_imagemagick
+screenshot_imagemagick()
{
import -window root "$1"
}
-function is_in_path
+is_in_path()
{
which $1 >/dev/null 2>&1
return $?
}
-function detect_command
+detect_command()
{
is_in_path "scrot"
if test $? -eq 0; then
@@ -45,7 +45,7 @@
fi
}
-function usage
+usage()
{
echo "usage: pekwm_screenshot.sh [-c scrot|netpbm|magick] [-d delay] [-o output.png]"
echo ""
@@ -61,7 +61,7 @@
exit 0
}
-function usage_command
+usage_command()
{
echo "Unable to find any supported commands for taking screenshots"
echo ""
@@ -74,7 +74,7 @@
exit 1
}
-function main
+main()
{
# Initialize for strict mode
command=""

View file

@ -1,25 +0,0 @@
--- 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;

View file

@ -44,6 +44,7 @@ bin/pekwm
%%DATADIR%%/themes/default/top-left_unfocus.png
%%DATADIR%%/themes/default/top-right.png
%%DATADIR%%/themes/default/top-right_unfocus.png
%%DATADIR%%/scripts/pekwm_screenshot.sh
%%DATADIR%%/scripts/pekwm_ws_menu.sh
%%DATADIR%%/scripts/pekwm_themeset.sh
@dirrm %%DATADIR%%/scripts