Date: Thursday, October 6, 2022 @ 19:51:24
Author: polyzen
Revision: 1322893
archrelease: copy trunk to community-x86_64
Added:
i3-wm/repos/community-x86_64/0001-Use-OVER-operator-for-drawing-text.patch
(from rev 1322892,
i3-wm/trunk/0001-Use-OVER-operator-for-drawing-text.patch)
i3-wm/repos/community-x86_64/PKGBUILD
(from rev 1322892, i3-wm/trunk/PKGBUILD)
i3-wm/repos/community-x86_64/keys/
Deleted:
i3-wm/repos/community-x86_64/0001-Use-OVER-operator-for-drawing-text.patch
i3-wm/repos/community-x86_64/PKGBUILD
i3-wm/repos/community-x86_64/keys/
-----------------------------------------------+
0001-Use-OVER-operator-for-drawing-text.patch | 70 +++++++-------
PKGBUILD | 116 ++++++++++++------------
2 files changed, 93 insertions(+), 93 deletions(-)
Deleted: 0001-Use-OVER-operator-for-drawing-text.patch
===================================================================
--- 0001-Use-OVER-operator-for-drawing-text.patch 2022-10-06 19:50:54 UTC
(rev 1322892)
+++ 0001-Use-OVER-operator-for-drawing-text.patch 2022-10-06 19:51:24 UTC
(rev 1322893)
@@ -1,35 +0,0 @@
-From eea280b1f1d9d66c903014fd6703f401eb119a87 Mon Sep 17 00:00:00 2001
-Message-Id:
<eea280b1f1d9d66c903014fd6703f401eb119a87.1504913100.git.jan.steff...@gmail.com>
-From: "Jan Alexander Steffens (heftig)" <[email protected]>
-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 1322892, 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 2022-10-06 19:51:24 UTC
(rev 1322893)
@@ -0,0 +1,35 @@
+From eea280b1f1d9d66c903014fd6703f401eb119a87 Mon Sep 17 00:00:00 2001
+Message-Id:
<eea280b1f1d9d66c903014fd6703f401eb119a87.1504913100.git.jan.steff...@gmail.com>
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+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 2022-10-06 19:50:54 UTC (rev 1322892)
+++ PKGBUILD 2022-10-06 19:51:24 UTC (rev 1322893)
@@ -1,58 +0,0 @@
-# Maintainer: Jelle van der Waa <[email protected]>
-# Maintainer: Levente Polyak <[email protected]>
-# Maintainer: Daniel M. Capella <[email protected]>
-# Contributor: Thorsten Töpper <[email protected]>
-
-pkgname=i3-wm
-pkgver=4.21
-pkgrel=2
-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')
-options=('debug')
-source=("$url/downloads/i3-$pkgver.tar.xz"{,.asc}
- '0001-Use-OVER-operator-for-drawing-text.patch'
-
"i3-respect-max-border-style.patch::https://github.com/i3/i3/commit/f6097d4a37f6775b03c363392dea4c7560743b13.patch";)
-b2sums=('cf53e0087cb4dabc8eefa8430cc5f7057de927ef49f8172a05c62d690ca60e5d20733da4f3a6230d311bf54a94f117d21665e3d2b39b7f45814e3b0462e12efe'
- 'SKIP'
-
'35be78fc8be805fa4b7f32c8a18c62a0436f433e9064ef5adf32baa9aa816276da3b53b977287640ab70f30eea14bbd4dc002d49d9149afa01e0706a45dba947'
-
'6ac21cf474b80617c8a269f318aa89ac1489f000222ab8ab20b2e21c79f9575eaf8189623bdab826f3f10e77c012604bb7ac2c1c020374faf2f4d8942a9f7eb8')
-validpgpkeys=('424E14D703E7C6D43D9D6F364E7160ED4AC8EE1D') # Michael Stapelberg
<[email protected]>
-
-prepare() {
- cd i3-$pkgver
- # https://github.com/i3/i3/pull/2925
- patch -Np1 -i ../0001-Use-OVER-operator-for-drawing-text.patch
- # https://github.com/i3/i3/issues/5149
- patch -Np1 -i ../i3-respect-max-border-style.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 1322892,
i3-wm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-10-06 19:51:24 UTC (rev 1322893)
@@ -0,0 +1,58 @@
+# Maintainer: Jelle van der Waa <[email protected]>
+# Maintainer: Levente Polyak <[email protected]>
+# Maintainer: Daniel M. Capella <[email protected]>
+# Contributor: Thorsten Töpper <[email protected]>
+
+pkgname=i3-wm
+pkgver=4.21
+pkgrel=3
+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')
+options=('debug')
+source=("$url/downloads/i3-$pkgver.tar.xz"{,.asc}
+ '0001-Use-OVER-operator-for-drawing-text.patch'
+
"i3-respect-max-border-style.patch::https://github.com/i3/i3/pull/5158.patch";)
+b2sums=('cf53e0087cb4dabc8eefa8430cc5f7057de927ef49f8172a05c62d690ca60e5d20733da4f3a6230d311bf54a94f117d21665e3d2b39b7f45814e3b0462e12efe'
+ 'SKIP'
+
'35be78fc8be805fa4b7f32c8a18c62a0436f433e9064ef5adf32baa9aa816276da3b53b977287640ab70f30eea14bbd4dc002d49d9149afa01e0706a45dba947'
+
'c09956abda0ac9094c459ae6c6c5f2917349f3ed4c3c2e78c981e49ca5541d3e3291e02117cbff7f53f9ad697971e178f60bcc47a5a334cf26330ad5a81eb4db')
+validpgpkeys=('424E14D703E7C6D43D9D6F364E7160ED4AC8EE1D') # Michael Stapelberg
<[email protected]>
+
+prepare() {
+ cd i3-$pkgver
+ # https://github.com/i3/i3/pull/2925
+ patch -Np1 -i ../0001-Use-OVER-operator-for-drawing-text.patch
+ # https://github.com/i3/i3/issues/5149
+ patch -Np1 -i ../i3-respect-max-border-style.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:
