[arch-commits] Commit in i3-wm/repos/community-x86_64 (4 files)

Daniel M. Capella polyzen at archlinux.org
Mon Feb 1 08:18:43 UTC 2021


    Date: Monday, February 1, 2021 @ 08:18:43
  Author: polyzen
Revision: 839500

archrelease: copy trunk to community-x86_64

Added:
  i3-wm/repos/community-x86_64/0001-Use-OVER-operator-for-drawing-text.patch
    (from rev 839499, i3-wm/trunk/0001-Use-OVER-operator-for-drawing-text.patch)
  i3-wm/repos/community-x86_64/PKGBUILD
    (from rev 839499, i3-wm/trunk/PKGBUILD)
Deleted:
  i3-wm/repos/community-x86_64/0001-Use-OVER-operator-for-drawing-text.patch
  i3-wm/repos/community-x86_64/PKGBUILD

-----------------------------------------------+
 0001-Use-OVER-operator-for-drawing-text.patch |   70 +++++++--------
 PKGBUILD                                      |  106 ++++++++++++------------
 2 files changed, 88 insertions(+), 88 deletions(-)

Deleted: 0001-Use-OVER-operator-for-drawing-text.patch
===================================================================
--- 0001-Use-OVER-operator-for-drawing-text.patch	2021-02-01 08:18:21 UTC (rev 839499)
+++ 0001-Use-OVER-operator-for-drawing-text.patch	2021-02-01 08:18:43 UTC (rev 839500)
@@ -1,35 +0,0 @@
-From eea280b1f1d9d66c903014fd6703f401eb119a87 Mon Sep 17 00:00:00 2001
-Message-Id: <eea280b1f1d9d66c903014fd6703f401eb119a87.1504913100.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sat, 9 Sep 2017 00:22:13 +0200
-Subject: [PATCH] Use OVER operator for drawing text
-
-For opaque text, SOURCE is not any different from OVER. However, when
-drawing color glyphs (which consist of RGBA pixels instead of strokes)
-SOURCE's handling of alpha is not what we want.
-
-I stumbled across this because cairo 1.15.8 seems to clear the surface
-before drawing color emoji if the operator is SOURCE, deleting every-
-thing drawn before. Arguably, the area outside the glyph bounds should
-not be touched, but even if this is a cairo bug the problem of alpha
-within the glyph remains.
----
- libi3/font.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libi3/font.c b/libi3/font.c
-index 81091ea74a31da11..aef8427b5396c3d8 100644
---- a/libi3/font.c
-+++ b/libi3/font.c
-@@ -105,7 +105,7 @@ static void draw_text_pango(const char *text, size_t text_len,
-         pango_layout_set_text(layout, text, text_len);
- 
-     /* Do the drawing */
--    cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-+    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
-     cairo_set_source_rgb(cr, pango_font_red, pango_font_green, pango_font_blue);
-     pango_cairo_update_layout(cr, layout);
-     pango_layout_get_pixel_size(layout, NULL, &height);
--- 
-2.14.1
-

Copied: i3-wm/repos/community-x86_64/0001-Use-OVER-operator-for-drawing-text.patch (from rev 839499, i3-wm/trunk/0001-Use-OVER-operator-for-drawing-text.patch)
===================================================================
--- 0001-Use-OVER-operator-for-drawing-text.patch	                        (rev 0)
+++ 0001-Use-OVER-operator-for-drawing-text.patch	2021-02-01 08:18:43 UTC (rev 839500)
@@ -0,0 +1,35 @@
+From eea280b1f1d9d66c903014fd6703f401eb119a87 Mon Sep 17 00:00:00 2001
+Message-Id: <eea280b1f1d9d66c903014fd6703f401eb119a87.1504913100.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sat, 9 Sep 2017 00:22:13 +0200
+Subject: [PATCH] Use OVER operator for drawing text
+
+For opaque text, SOURCE is not any different from OVER. However, when
+drawing color glyphs (which consist of RGBA pixels instead of strokes)
+SOURCE's handling of alpha is not what we want.
+
+I stumbled across this because cairo 1.15.8 seems to clear the surface
+before drawing color emoji if the operator is SOURCE, deleting every-
+thing drawn before. Arguably, the area outside the glyph bounds should
+not be touched, but even if this is a cairo bug the problem of alpha
+within the glyph remains.
+---
+ libi3/font.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libi3/font.c b/libi3/font.c
+index 81091ea74a31da11..aef8427b5396c3d8 100644
+--- a/libi3/font.c
++++ b/libi3/font.c
+@@ -105,7 +105,7 @@ static void draw_text_pango(const char *text, size_t text_len,
+         pango_layout_set_text(layout, text, text_len);
+ 
+     /* Do the drawing */
+-    cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
++    cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
+     cairo_set_source_rgb(cr, pango_font_red, pango_font_green, pango_font_blue);
+     pango_cairo_update_layout(cr, layout);
+     pango_layout_get_pixel_size(layout, NULL, &height);
+-- 
+2.14.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-02-01 08:18:21 UTC (rev 839499)
+++ PKGBUILD	2021-02-01 08:18:43 UTC (rev 839500)
@@ -1,53 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
-# Maintainer: Levente Polyak <anthraxx at archlinux.org>
-# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
-# Contributor: Thorsten Töpper <atsutane-tu at freethoughts.de>
-
-pkgname=i3-wm
-pkgver=4.19
-pkgrel=1
-pkgdesc='Improved dynamic tiling window manager'
-arch=('x86_64')
-url=https://i3wm.org
-license=('BSD')
-groups=('i3')
-depends=('libev' 'libxkbcommon-x11' 'pango' 'startup-notification'
-         'xcb-util-cursor' 'xcb-util-keysyms' 'xcb-util-wm' 'xcb-util-xrm'
-         'yajl')
-makedepends=('meson' 'xmlto')
-optdepends=('dmenu: for the default program launcher'
-            'rofi: for a modern dmenu replacement'
-            'i3lock: for the default screen locker'
-            'xss-lock: for the default screen locker'
-            'i3status: for the default status bar generator'
-            'perl: for i3-save-tree and i3-dmenu-desktop'
-            'perl-anyevent-i3: for i3-save-tree'
-            'perl-json-xs: for i3-save-tree')
-replaces=('i3' 'i3bar')
-backup=('etc/i3/config')
-source=("$url/downloads/i3-$pkgver.tar.xz"{,.asc}
-        '0001-Use-OVER-operator-for-drawing-text.patch')
-b2sums=('3af5eac9cb618bc3b3da0bca430e1882701802f49e092d1e6fa7a35ceb3f2c0287b66eceeb0123a7dfda9976df06227bec34d7d98873aedc2292a2ba94584d84'
-        'SKIP'
-        '35be78fc8be805fa4b7f32c8a18c62a0436f433e9064ef5adf32baa9aa816276da3b53b977287640ab70f30eea14bbd4dc002d49d9149afa01e0706a45dba947')
-validpgpkeys=('424E14D703E7C6D43D9D6F364E7160ED4AC8EE1D') # Michael Stapelberg
-
-prepare() {
-  cd i3-$pkgver
-  # https://github.com/i3/i3/pull/2925
-  patch -Np1 -i ../0001-Use-OVER-operator-for-drawing-text.patch
-}
-
-build() {
-  cd i3-$pkgver
-  arch-meson build
-  ninja -C build
-}
-
-package() {
-  cd i3-$pkgver
-  DESTDIR="$pkgdir" ninja -C build install
-  install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE
-}
-
-# vim:set ts=2 sw=2 et:

Copied: i3-wm/repos/community-x86_64/PKGBUILD (from rev 839499, i3-wm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-02-01 08:18:43 UTC (rev 839500)
@@ -0,0 +1,53 @@
+# Maintainer: Jelle van der Waa <jelle at vdwaa.nl>
+# Maintainer: Levente Polyak <anthraxx at archlinux.org>
+# Maintainer: Daniel M. Capella <polyzen at archlinux.org>
+# Contributor: Thorsten Töpper <atsutane-tu at freethoughts.de>
+
+pkgname=i3-wm
+pkgver=4.19.1
+pkgrel=1
+pkgdesc='Improved dynamic tiling window manager'
+arch=('x86_64')
+url=https://i3wm.org
+license=('BSD')
+groups=('i3')
+depends=('libev' 'libxkbcommon-x11' 'pango' 'startup-notification'
+         'xcb-util-cursor' 'xcb-util-keysyms' 'xcb-util-wm' 'xcb-util-xrm'
+         'yajl')
+makedepends=('meson' 'xmlto')
+optdepends=('dmenu: for the default program launcher'
+            'rofi: for a modern dmenu replacement'
+            'i3lock: for the default screen locker'
+            'xss-lock: for the default screen locker'
+            'i3status: for the default status bar generator'
+            'perl: for i3-save-tree and i3-dmenu-desktop'
+            'perl-anyevent-i3: for i3-save-tree'
+            'perl-json-xs: for i3-save-tree')
+replaces=('i3' 'i3bar')
+backup=('etc/i3/config')
+source=("$url/downloads/i3-$pkgver.tar.xz"{,.asc}
+        '0001-Use-OVER-operator-for-drawing-text.patch')
+b2sums=('a4d01d10c076da092faef2111ba0fadb481257c0011419cc911be0b63c0ff78053a39ff4a2887f6344794ea895190ebf1ac3585b598dbb90ff77d4de8fad7c53'
+        'SKIP'
+        '35be78fc8be805fa4b7f32c8a18c62a0436f433e9064ef5adf32baa9aa816276da3b53b977287640ab70f30eea14bbd4dc002d49d9149afa01e0706a45dba947')
+validpgpkeys=('424E14D703E7C6D43D9D6F364E7160ED4AC8EE1D') # Michael Stapelberg <michael at stapelberg.de>
+
+prepare() {
+  cd i3-$pkgver
+  # https://github.com/i3/i3/pull/2925
+  patch -Np1 -i ../0001-Use-OVER-operator-for-drawing-text.patch
+}
+
+build() {
+  cd i3-$pkgver
+  arch-meson build
+  ninja -C build
+}
+
+package() {
+  cd i3-$pkgver
+  DESTDIR="$pkgdir" ninja -C build install
+  install -Dm644 -t "$pkgdir"/usr/share/licenses/$pkgname LICENSE
+}
+
+# vim:set ts=2 sw=2 et:


More information about the arch-commits mailing list