[arch-commits] Commit in xfwm4/repos (10 files)
Evangelos Foutras
foutrelis at archlinux.org
Sun Mar 15 10:49:42 UTC 2015
Date: Sunday, March 15, 2015 @ 11:49:42
Author: foutrelis
Revision: 233869
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xfwm4/repos/extra-i686/0001-Fix-a-mishmash-between-width-and-height.patch
(from rev 233868, xfwm4/trunk/0001-Fix-a-mishmash-between-width-and-height.patch)
xfwm4/repos/extra-i686/PKGBUILD
(from rev 233868, xfwm4/trunk/PKGBUILD)
xfwm4/repos/extra-i686/xfwm4.install
(from rev 233868, xfwm4/trunk/xfwm4.install)
xfwm4/repos/extra-x86_64/0001-Fix-a-mishmash-between-width-and-height.patch
(from rev 233868, xfwm4/trunk/0001-Fix-a-mishmash-between-width-and-height.patch)
xfwm4/repos/extra-x86_64/PKGBUILD
(from rev 233868, xfwm4/trunk/PKGBUILD)
xfwm4/repos/extra-x86_64/xfwm4.install
(from rev 233868, xfwm4/trunk/xfwm4.install)
Deleted:
xfwm4/repos/extra-i686/PKGBUILD
xfwm4/repos/extra-i686/xfwm4.install
xfwm4/repos/extra-x86_64/PKGBUILD
xfwm4/repos/extra-x86_64/xfwm4.install
-----------------------------------------------------------------+
/PKGBUILD | 100 ++++++++++
/xfwm4.install | 26 ++
extra-i686/0001-Fix-a-mishmash-between-width-and-height.patch | 37 +++
extra-i686/PKGBUILD | 41 ----
extra-i686/xfwm4.install | 13 -
extra-x86_64/0001-Fix-a-mishmash-between-width-and-height.patch | 37 +++
extra-x86_64/PKGBUILD | 41 ----
extra-x86_64/xfwm4.install | 13 -
8 files changed, 200 insertions(+), 108 deletions(-)
Copied: xfwm4/repos/extra-i686/0001-Fix-a-mishmash-between-width-and-height.patch (from rev 233868, xfwm4/trunk/0001-Fix-a-mishmash-between-width-and-height.patch)
===================================================================
--- extra-i686/0001-Fix-a-mishmash-between-width-and-height.patch (rev 0)
+++ extra-i686/0001-Fix-a-mishmash-between-width-and-height.patch 2015-03-15 10:49:42 UTC (rev 233869)
@@ -0,0 +1,37 @@
+From adcf17fe8a136c89196f952185056c12c3829a01 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan at xfce.org>
+Date: Sun, 15 Mar 2015 11:24:15 +0100
+Subject: [PATCH] Fix a mishmash between width and height
+
+Bug: 11700
+
+Duh...
+
+Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
+---
+ src/client.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/client.c b/src/client.c
+index 7fa9e36..38ecc6f 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -543,12 +543,12 @@ clientAdjustCoordGravity (Client *c, int gravity, XWindowChanges *wc, unsigned l
+
+ if (*mask & CWWidth)
+ {
+- wc->width = clientCheckHeight (c, wc->width, TRUE);
++ wc->width = clientCheckWidth (c, wc->width, TRUE);
+ }
+
+- if (*mask & CWWidth)
++ if (*mask & CWHeight)
+ {
+- wc->height = clientCheckWidth (c, wc->height, TRUE);
++ wc->height = clientCheckHeight (c, wc->height, TRUE);
+ }
+
+ switch (gravity)
+--
+2.3.3
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-03-15 10:49:27 UTC (rev 233868)
+++ extra-i686/PKGBUILD 2015-03-15 10:49:42 UTC (rev 233869)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfwm4
-pkgver=4.12.1
-pkgrel=1
-pkgdesc="Xfce window manager"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'libwnck' 'libdrm' 'hicolor-icon-theme')
-makedepends=('intltool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('4e9b94517cc1550c4ff4ff8ac252c95ef0d3345b1f5f04dbf2ca9e3c708de1bb')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-startup-notification \
- --enable-randr \
- --enable-compositor \
- --enable-xsync \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-i686/PKGBUILD (from rev 233868, xfwm4/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-03-15 10:49:42 UTC (rev 233869)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfwm4
+pkgver=4.12.1
+pkgrel=2
+pkgdesc="Xfce window manager"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'libwnck' 'libdrm' 'hicolor-icon-theme')
+makedepends=('intltool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+ 0001-Fix-a-mishmash-between-width-and-height.patch)
+sha256sums=('4e9b94517cc1550c4ff4ff8ac252c95ef0d3345b1f5f04dbf2ca9e3c708de1bb'
+ '79c7d1b494f56f9a2d5da1ceb9cdad8014f6d45547b972326fe2d2d74b6970ae')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=11700
+ patch -Np1 -i ../0001-Fix-a-mishmash-between-width-and-height.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-startup-notification \
+ --enable-randr \
+ --enable-compositor \
+ --enable-xsync \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-i686/xfwm4.install
===================================================================
--- extra-i686/xfwm4.install 2015-03-15 10:49:27 UTC (rev 233868)
+++ extra-i686/xfwm4.install 2015-03-15 10:49:42 UTC (rev 233869)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-i686/xfwm4.install (from rev 233868, xfwm4/trunk/xfwm4.install)
===================================================================
--- extra-i686/xfwm4.install (rev 0)
+++ extra-i686/xfwm4.install 2015-03-15 10:49:42 UTC (rev 233869)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-x86_64/0001-Fix-a-mishmash-between-width-and-height.patch (from rev 233868, xfwm4/trunk/0001-Fix-a-mishmash-between-width-and-height.patch)
===================================================================
--- extra-x86_64/0001-Fix-a-mishmash-between-width-and-height.patch (rev 0)
+++ extra-x86_64/0001-Fix-a-mishmash-between-width-and-height.patch 2015-03-15 10:49:42 UTC (rev 233869)
@@ -0,0 +1,37 @@
+From adcf17fe8a136c89196f952185056c12c3829a01 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan at xfce.org>
+Date: Sun, 15 Mar 2015 11:24:15 +0100
+Subject: [PATCH] Fix a mishmash between width and height
+
+Bug: 11700
+
+Duh...
+
+Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
+---
+ src/client.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/client.c b/src/client.c
+index 7fa9e36..38ecc6f 100644
+--- a/src/client.c
++++ b/src/client.c
+@@ -543,12 +543,12 @@ clientAdjustCoordGravity (Client *c, int gravity, XWindowChanges *wc, unsigned l
+
+ if (*mask & CWWidth)
+ {
+- wc->width = clientCheckHeight (c, wc->width, TRUE);
++ wc->width = clientCheckWidth (c, wc->width, TRUE);
+ }
+
+- if (*mask & CWWidth)
++ if (*mask & CWHeight)
+ {
+- wc->height = clientCheckWidth (c, wc->height, TRUE);
++ wc->height = clientCheckHeight (c, wc->height, TRUE);
+ }
+
+ switch (gravity)
+--
+2.3.3
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-03-15 10:49:27 UTC (rev 233868)
+++ extra-x86_64/PKGBUILD 2015-03-15 10:49:42 UTC (rev 233869)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfwm4
-pkgver=4.12.1
-pkgrel=1
-pkgdesc="Xfce window manager"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'libwnck' 'libdrm' 'hicolor-icon-theme')
-makedepends=('intltool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('4e9b94517cc1550c4ff4ff8ac252c95ef0d3345b1f5f04dbf2ca9e3c708de1bb')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-startup-notification \
- --enable-randr \
- --enable-compositor \
- --enable-xsync \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-x86_64/PKGBUILD (from rev 233868, xfwm4/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-03-15 10:49:42 UTC (rev 233869)
@@ -0,0 +1,50 @@
+# $Id$
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: tobias <tobias funnychar archlinux.org>
+
+pkgname=xfwm4
+pkgver=4.12.1
+pkgrel=2
+pkgdesc="Xfce window manager"
+arch=('i686' 'x86_64')
+url="http://www.xfce.org/"
+license=('GPL2')
+groups=('xfce4')
+depends=('libxfce4ui' 'libwnck' 'libdrm' 'hicolor-icon-theme')
+makedepends=('intltool')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+ 0001-Fix-a-mishmash-between-width-and-height.patch)
+sha256sums=('4e9b94517cc1550c4ff4ff8ac252c95ef0d3345b1f5f04dbf2ca9e3c708de1bb'
+ '79c7d1b494f56f9a2d5da1ceb9cdad8014f6d45547b972326fe2d2d74b6970ae')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=11700
+ patch -Np1 -i ../0001-Fix-a-mishmash-between-width-and-height.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --localstatedir=/var \
+ --disable-static \
+ --enable-startup-notification \
+ --enable-randr \
+ --enable-compositor \
+ --enable-xsync \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: extra-x86_64/xfwm4.install
===================================================================
--- extra-x86_64/xfwm4.install 2015-03-15 10:49:27 UTC (rev 233868)
+++ extra-x86_64/xfwm4.install 2015-03-15 10:49:42 UTC (rev 233869)
@@ -1,13 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: xfwm4/repos/extra-x86_64/xfwm4.install (from rev 233868, xfwm4/trunk/xfwm4.install)
===================================================================
--- extra-x86_64/xfwm4.install (rev 0)
+++ extra-x86_64/xfwm4.install 2015-03-15 10:49:42 UTC (rev 233869)
@@ -0,0 +1,13 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list