[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/files/, x11-wm/i3/

2017-06-23 Thread Michael Palimaka 
commit: f12553dc4d9f7aaa62a11fbabf7a40e0cfab4be1
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Jun 24 02:04:54 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jun 24 02:05:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12553dc

x11-wm/i3: remove old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 x11-wm/i3/Manifest  |   5 -
 x11-wm/i3/files/i3-4.12-pango.patch | 181 
 x11-wm/i3/i3-4.10.4.ebuild  |  72 --
 x11-wm/i3/i3-4.11.ebuild|  72 --
 x11-wm/i3/i3-4.12.ebuild|  85 -
 x11-wm/i3/i3-4.8.ebuild |  72 --
 x11-wm/i3/i3-4.9.1.ebuild   |  72 --
 x11-wm/i3/metadata.xml  |   1 -
 8 files changed, 560 deletions(-)

diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 9d7b49af5ca..71328505cda 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,6 +1 @@
-DIST i3-4.10.4.tar.bz2 940744 SHA256 
dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e SHA512 
e777d1ca8ebeada185dfe11443a8b731cb72b6f836a0848e24291ea5d70e4b6d6c414acd58c156be97bd90d07ba4019a713cdb406a24fda33afeae08ceb6ed18
 WHIRLPOOL 
5bfaeb74d8f1c3dc10719bcac56087d7716e0a7a6c251495db256af1d1342eea3baae4b5c4f6c8131efa89393016c0dd0a56b17ff1f7bd757185dbf4747e7441
-DIST i3-4.11.tar.bz2 972929 SHA256 
78ce1e06fbd92fd63765bbe23faa7b8f929c17f99ed623f7abf2e568169d982f SHA512 
76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df328f912ff49a4f
 WHIRLPOOL 
f3bff5c0386ad09c5cabb25c7ccb14033f1a7ba3ee19fcc832739cbc61a31f84d3a57418264db4728fbb406c24464a8c87cbfde1e651599a3b63d87eb0af11cb
-DIST i3-4.12.tar.bz2 988084 SHA256 
e19e1ce08c2549cba83e083cc768d487202c41760d5c283f67752e791f1d78b4 SHA512 
966f62dbd82c6c70d1344cc61f14f154f3f649ce1b5a5b5168f00f50d598582ef26f5bd5496ea62e13213e45b1c7043f6209c94fcbefe2947fec63284445c1f5
 WHIRLPOOL 
7cf414de6d375029328edc8d824d2542ccae99ddf48eac9a563e81e0e86db5506f45f851d5af755ebfe8514e9afb5f8394d962fb191f4b0ab4268a81b8397395
 DIST i3-4.13.tar.bz2 1121298 SHA256 
94c13183e527a984132a3b050c8bf629626502a6e133e07b413641aec5f8cf8a SHA512 
1bb1044e8d86e78d3ccb79d49f0eb26665dcd05a348058a5e57138151d74f57d77830efc3025893170fe1b8ec612f739f75247a427410f96286b09afd2c5f14c
 WHIRLPOOL 
c0e9b205837e30d214d525af6ceb8adcc4cbbba42d9aa0eab4e7639cbd8884d827c5783590eb23a6790e8d8d87fb81884afa369e48a7ae474613392dc6f9b371
-DIST i3-4.8.tar.bz2 939690 SHA256 
502c34290f239780bb40352191f0500e8f35d2446eddb573c67c27873d6a1b6b SHA512 
fd6f92da857246119f1ae710b6c5168128fa2da5eae8308550b1b9c75879f060cac8246897333f3d67e18de36828a11dd12b4ccee9bd6cd6ad32e2b44c50b43e
 WHIRLPOOL 
6c6288cb66ffdbf225df0dfcdc4f540cd36d7c8333a9f9d9c363cb6580d6a7c1ca0deb227a8f46ac907f2afc6e4e46efc448a51f0764a167bb9639956beae4ef
-DIST i3-4.9.1.tar.bz2 939630 SHA256 
b70deff027c7d05276c9646e53faeeeccdde706370b9b337a633bed85b16dc43 SHA512 
7a8f71dd944faae426a2239b8bf12ea1cfc83a95c49fcb64ded8321ef302f3277af7d2ecd84d99cef47aba73e5a1091f94e37e9ed2af78c4722ffee507477c90
 WHIRLPOOL 
15cd2722beaeef642815edd44ff189ff0d003fefbff71c067b94a65dadb55cd15dd1a142a37499fa55cc80424dbdc74cb979c8998d740addcc492eaf025e467f

diff --git a/x11-wm/i3/files/i3-4.12-pango.patch 
b/x11-wm/i3/files/i3-4.12-pango.patch
deleted file mode 100644
index 6442796cae7..000
--- a/x11-wm/i3/files/i3-4.12-pango.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-Fixes builds with without pango/cairo
-
-https://github.com/i3/i3/pull/2243
-https://bugs.gentoo.org/show_bug.cgi?id=576664
-
 a/include/libi3.h
-+++ b/include/libi3.h
-@@ -20,7 +20,7 @@
- #if PANGO_SUPPORT
- #include 
- #endif
--#ifdef CAIRO_SUPPORT
-+#if CAIRO_SUPPORT
- #include 
- #endif
- 
-@@ -518,7 +518,7 @@ typedef struct placeholder_t {
-  */
- char *format_placeholders(char *format, placeholder_t *placeholders, int num);
- 
--#ifdef CAIRO_SUPPORT
-+#if CAIRO_SUPPORT
- /* We need to flush cairo surfaces twice to avoid an assertion bug. See #1989
-  * and https://bugs.freedesktop.org/show_bug.cgi?id=92455. */
- #define CAIRO_SURFACE_FLUSH(surface)  \
-@@ -542,7 +542,7 @@ typedef struct surface_t {
- int width;
- int height;
- 
--#ifdef CAIRO_SUPPORT
-+#if CAIRO_SUPPORT
- /* A cairo surface representing the drawable. */
- cairo_surface_t *surface;
- 
 a/libi3/draw_util.c
-+++ b/libi3/draw_util.c
-@@ -11,7 +11,7 @@
- #include 
- #include 
- #include 
--#ifdef CAIRO_SUPPORT
-+#if CAIRO_SUPPORT
- #include 
- #endif
- 
-@@ -50,7 +50,7 @@ void draw_util_surface_init(xcb_connection_t *conn, 
surface_t *surface, xcb_draw
- ELOG("Could not create graphical context. Error code: %d. Please 
report this bug.\n", error->error_code);
- }
- 
--#ifdef CAIRO_SUPPORT
-+#if CAIRO_SUPPORT
- surface->surface = cairo_xcb_surface_create(conn, surface->id, 
surface->visual_type, width, height);
- surface->cr =

[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/files/, x11-wm/i3/

2016-03-07 Thread Kacper Kowalik 
commit: c28560d3da197cb22026c308aab16a56b87ed4f1
Author: Kacper Kowalik  gentoo  org>
AuthorDate: Tue Mar  8 02:10:50 2016 +
Commit: Kacper Kowalik  gentoo  org>
CommitDate: Tue Mar  8 02:11:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28560d3

x11-wm/i3: fix build without cairo/pango, correct dep on cairo version

Fixes bug #576664

Reported-by: Coacher 

Package-Manager: portage-2.2.27

 x11-wm/i3/files/i3-4.12-pango.patch | 181 
 x11-wm/i3/i3-4.12.ebuild|  19 +++-
 2 files changed, 197 insertions(+), 3 deletions(-)

diff --git a/x11-wm/i3/files/i3-4.12-pango.patch 
b/x11-wm/i3/files/i3-4.12-pango.patch
new file mode 100644
index 000..6442796
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.12-pango.patch
@@ -0,0 +1,181 @@
+Fixes builds with without pango/cairo
+
+https://github.com/i3/i3/pull/2243
+https://bugs.gentoo.org/show_bug.cgi?id=576664
+
+--- a/include/libi3.h
 b/include/libi3.h
+@@ -20,7 +20,7 @@
+ #if PANGO_SUPPORT
+ #include 
+ #endif
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ #include 
+ #endif
+ 
+@@ -518,7 +518,7 @@ typedef struct placeholder_t {
+  */
+ char *format_placeholders(char *format, placeholder_t *placeholders, int num);
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ /* We need to flush cairo surfaces twice to avoid an assertion bug. See #1989
+  * and https://bugs.freedesktop.org/show_bug.cgi?id=92455. */
+ #define CAIRO_SURFACE_FLUSH(surface)  \
+@@ -542,7 +542,7 @@ typedef struct surface_t {
+ int width;
+ int height;
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ /* A cairo surface representing the drawable. */
+ cairo_surface_t *surface;
+ 
+--- a/libi3/draw_util.c
 b/libi3/draw_util.c
+@@ -11,7 +11,7 @@
+ #include 
+ #include 
+ #include 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ #include 
+ #endif
+ 
+@@ -50,7 +50,7 @@ void draw_util_surface_init(xcb_connection_t *conn, 
surface_t *surface, xcb_draw
+ ELOG("Could not create graphical context. Error code: %d. Please 
report this bug.\n", error->error_code);
+ }
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ surface->surface = cairo_xcb_surface_create(conn, surface->id, 
surface->visual_type, width, height);
+ surface->cr = cairo_create(surface->surface);
+ #endif
+@@ -62,7 +62,7 @@ void draw_util_surface_init(xcb_connection_t *conn, 
surface_t *surface, xcb_draw
+  */
+ void draw_util_surface_free(xcb_connection_t *conn, surface_t *surface) {
+ xcb_free_gc(conn, surface->gc);
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ cairo_surface_destroy(surface->surface);
+ cairo_destroy(surface->cr);
+ 
+@@ -81,7 +81,7 @@ void draw_util_surface_free(xcb_connection_t *conn, 
surface_t *surface) {
+ void draw_util_surface_set_size(surface_t *surface, int width, int height) {
+ surface->width = width;
+ surface->height = height;
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ cairo_xcb_surface_set_size(surface->surface, width, height);
+ #endif
+ }
+@@ -121,7 +121,7 @@ color_t draw_util_hex_to_color(const char *color) {
+ static void draw_util_set_source_color(xcb_connection_t *conn, surface_t 
*surface, color_t color) {
+ RETURN_UNLESS_SURFACE_INITIALIZED(surface);
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ cairo_set_source_rgba(surface->cr, color.red, color.green, color.blue, 
color.alpha);
+ #else
+ uint32_t colorpixel = color.colorpixel;
+@@ -139,7 +139,7 @@ static void draw_util_set_source_color(xcb_connection_t 
*conn, surface_t *surfac
+ void draw_util_text(i3String *text, surface_t *surface, color_t fg_color, 
color_t bg_color, int x, int y, int max_width) {
+ RETURN_UNLESS_SURFACE_INITIALIZED(surface);
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ /* Flush any changes before we draw the text as this might use XCB 
directly. */
+ CAIRO_SURFACE_FLUSH(surface->surface);
+ #endif
+@@ -147,7 +147,7 @@ void draw_util_text(i3String *text, surface_t *surface, 
color_t fg_color, color_
+ set_font_colors(surface->gc, fg_color, bg_color);
+ draw_text(text, surface->id, surface->gc, surface->visual_type, x, y, 
max_width);
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ /* Notify cairo that we (possibly) used another way to draw on the 
surface. */
+ cairo_surface_mark_dirty(surface->surface);
+ #endif
+@@ -162,7 +162,7 @@ void draw_util_text(i3String *text, surface_t *surface, 
color_t fg_color, color_
+ void draw_util_rectangle(xcb_connection_t *conn, surface_t *surface, color_t 
color, double x, double y, double w, double h) {
+ RETURN_UNLESS_SURFACE_INITIALIZED(surface);
+ 
+-#ifdef CAIRO_SUPPORT
++#if CAIRO_SUPPORT
+ cairo_save(surface->cr);
+ 
+ /* Using the SOURCE operator will copy both color and alpha information 
directly
+@@ -194,7 +194,7 @@ void draw_util_rectangle(xcb_connection_t *conn, surface_t 
*surface, color_t col
+ void draw_util_clear_surface(xcb_connection_t *conn,