From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH] gnu: Add wmctrl. Date: Fri, 05 Dec 2014 15:54:52 +0300 Message-ID: <87oaridzoj.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwsPV-0008Fk-2u for guix-devel@gnu.org; Fri, 05 Dec 2014 07:55:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwsPR-0001NI-10 for guix-devel@gnu.org; Fri, 05 Dec 2014 07:55:01 -0500 Received: from mail-lb0-x231.google.com ([2a00:1450:4010:c04::231]:65136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwsPQ-0001N5-K4 for guix-devel@gnu.org; Fri, 05 Dec 2014 07:54:56 -0500 Received: by mail-lb0-f177.google.com with SMTP id b6so466488lbj.8 for ; Fri, 05 Dec 2014 04:54:55 -0800 (PST) Received: from leviafan (128-74-166-79.broadband.corbina.ru. [128.74.166.79]) by mx.google.com with ESMTPSA id g3sm8307794lbc.36.2014.12.05.04.54.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Dec 2014 04:54:53 -0800 (PST) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain A couple of notes on this package: - I took the patch for fixing 64-bit bug from . Should the header comment be changed? - I tested it only on 32-bit machine so I don't really know how it works on 64-bit. - Is it ok to make "wmctrl.scm" or would it be more appropriate to put it into "xdisorg.scm"? --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-wmctrl.patch Content-Transfer-Encoding: quoted-printable >From 080fcefdcb814cc0942569ea0fb8d61513a4ec8a Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 5 Dec 2014 00:22:04 +0300 Subject: [PATCH] gnu: Add wmctrl. * gnu/packages/wmctrl.scm: New file. * gnu/packages/patches/wmctrl-64-fix.patch: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add package file. (dist_patch_DATA): Add patch file. --- gnu-system.am | 2 ++ gnu/packages/patches/wmctrl-64-fix.patch | 32 +++++++++++++++++ gnu/packages/wmctrl.scm | 61 ++++++++++++++++++++++++++++= ++++ 3 files changed, 95 insertions(+) create mode 100644 gnu/packages/patches/wmctrl-64-fix.patch create mode 100644 gnu/packages/wmctrl.scm diff --git a/gnu-system.am b/gnu-system.am index b3ba176..4077720 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -269,6 +269,7 @@ GNU_SYSTEM_MODULES =3D \ gnu/packages/wget.scm \ gnu/packages/which.scm \ gnu/packages/wine.scm \ + gnu/packages/wmctrl.scm \ gnu/packages/wordnet.scm \ gnu/packages/wv.scm \ gnu/packages/xfig.scm \ @@ -443,6 +444,7 @@ dist_patch_DATA =3D \ gnu/packages/patches/util-linux-perl.patch \ gnu/packages/patches/vpnc-script.patch \ gnu/packages/patches/w3m-fix-compile.patch \ + gnu/packages/patches/wmctrl-64-fix.patch gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch \ gnu/packages/patches/xf86-video-openchrome-includes.patch \ gnu/packages/patches/xmodmap-asprintf.patch diff --git a/gnu/packages/patches/wmctrl-64-fix.patch b/gnu/packages/patche= s/wmctrl-64-fix.patch new file mode 100644 index 0000000..3ec1c91 --- /dev/null +++ b/gnu/packages/patches/wmctrl-64-fix.patch @@ -0,0 +1,32 @@ +Description: Correct 64 Architecture implementation of 32 bit data +Author: Chris Donoghue +Bug-Debian: http://bugs.debian.org/362068 + +--- wmctrl-1.07.orig/main.c ++++ wmctrl-1.07/main.c +@@ -1425,6 +1425,16 @@ static gchar *get_property (Display *dis + * + * long_length =3D Specifies the length in 32-bit multiples of the + * data to be retrieved. ++ * ++ * NOTE: see=20 ++ * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.ht= ml ++ * In particular: ++ * ++ * When the X window system was ported to 64-bit architectures, a ++ * rather peculiar design decision was made. 32-bit quantities such ++ * as Window IDs, atoms, etc, were kept as longs in the client side ++ * APIs, even when long was changed to 64 bits. ++ * + */ + if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE= _LEN / 4, False, + xa_prop_type, &xa_ret_type, &ret_format,=20=20=20=20=20 +@@ -1441,6 +1451,8 @@ static gchar *get_property (Display *dis +=20 + /* null terminate the result to make string handling easier */ + tmp_size =3D (ret_format / 8) * ret_nitems; ++ /* Correct 64 Architecture implementation of 32 bit data */ ++ if(ret_format=3D=3D32) tmp_size *=3D sizeof(long)/4; + ret =3D g_malloc(tmp_size + 1); + memcpy(ret, ret_prop, tmp_size); + ret[tmp_size] =3D '\0'; diff --git a/gnu/packages/wmctrl.scm b/gnu/packages/wmctrl.scm new file mode 100644 index 0000000..a664dc8 --- /dev/null +++ b/gnu/packages/wmctrl.scm @@ -0,0 +1,61 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2014 Alex Kost +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages wmctrl) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix licenses) + #:use-module (gnu packages) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages glib) + #:use-module (gnu packages xorg)) + +(define-public wmctrl + (package + (name "wmctrl") + (version "1.07") + (source (origin + (method url-fetch) + (uri (string-append + "http://tomas.styblo.name/wmctrl/dist/wmctrl-" + version ".tar.gz")) + (sha256 + (base32 + "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np")) + (patches (list (search-patch "wmctrl-64-fix.patch"))))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list (string-append "--mandir=3D" + (assoc-ref %outputs "out") + "/share/man")))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libx11" ,libx11) + ("libxmu" ,libxmu) + ("glib" ,glib))) + (home-page "http://tomas.styblo.name/wmctrl/") + (synopsis "Command-line tool to control X Window Manager") + (description + "Wmctrl allows to interact with an X Window Manager that is compatible +with the EWMH/NetWM specification. It can query the Window Manager for +information, and request for certain window management actions (resize and +move windows, switch between desktops, etc.)") + (license gpl2+))) --=20 2.1.3 --=-=-=--