[gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/, x11-libs/libxcb/files/
commit: 195e1a3fde15d42f068a398f95c1211ff1f2fa09 Author: Matt Turner gentoo org> AuthorDate: Thu Nov 19 04:12:04 2020 + Commit: Matt Turner gentoo org> CommitDate: Thu Nov 19 04:14:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195e1a3f x11-libs/libxcb: Fix tests with dev-libs/check >= 0.15 Closes: https://bugs.gentoo.org/746884 Signed-off-by: Matt Turner gentoo.org> ...on-t-use-deprecated-fail_unless-check-API.patch | 86 ++ x11-libs/libxcb/libxcb-1.14.ebuild | 4 + 2 files changed, 90 insertions(+) diff --git a/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch new file mode 100644 index 000..cc7f22ba4e9 --- /dev/null +++ b/x11-libs/libxcb/files/libxcb-1.14-tests-don-t-use-deprecated-fail_unless-check-API.patch @@ -0,0 +1,86 @@ +From f01f3c378eb0168fbb055c7be1c2d08a7acd3752 Mon Sep 17 00:00:00 2001 +From: Ran Benita +Date: Tue, 17 Nov 2020 23:43:06 +0200 +Subject: [PATCH] tests: don't use deprecated fail_unless check API + +It causes errors like this when running make check: + +check_public.c:40:24: error: too many arguments for format [-Werror=format-extra-args] + 40 | fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name); + +Closes: https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/49 +Tested-by: Matt Turner +Signed-off-by: Ran Benita +--- + configure.ac | 2 +- + tests/check_public.c | 30 +++--- + 2 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/tests/check_public.c b/tests/check_public.c +index 2094bfe..aed40c8 100644 +--- a/tests/check_public.c b/tests/check_public.c +@@ -37,18 +37,18 @@ static void parse_display_pass(const char *name, const char *host, const int dis + got_display = got_screen = -42; + mark_point(); + success = xcb_parse_display(argument, &got_host, &got_display, &got_screen); +- fail_unless(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name); +- fail_unless(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host); +- fail_unless(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display); +- fail_unless(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen); ++ ck_assert_msg(success, "unexpected parse failure %sfor '%s'", test_string[test_type], name); ++ ck_assert_msg(strcmp(host, got_host) == 0, "parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host); ++ ck_assert_msg(display == got_display, "parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display); ++ ck_assert_msg(screen == got_screen, "parse %sproduced unexpected screen '%d' for '%s': expected '%d'", test_string[test_type], got_screen, name, screen); + + got_host = (char *) -1; + got_display = got_screen = -42; + mark_point(); + success = xcb_parse_display(argument, &got_host, &got_display, 0); +- fail_unless(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name); +- fail_unless(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host); +- fail_unless(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display); ++ ck_assert_msg(success, "unexpected screenless parse failure %sfor '%s'", test_string[test_type], name); ++ ck_assert_msg(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host); ++ ck_assert_msg(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display); + } + putenv("DISPLAY="); + } +@@ -79,18 +79,18 @@ static void parse_display_fail(const char *name) + got_display = got_screen = -42; + mark_point(); + success = xcb_parse_display(argument, &got_host, &got_display, &got_screen); +- fail_unless(!success, "unexpected parse success %sfor '%s'", test_string[test_type], name); +- fail_unless(got_h
[gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/, x11-libs/libxcb/files/
commit: 62a5fd84f037cc2848ae10c12c1a0be9d1dc Author: Matt Turner gentoo org> AuthorDate: Sun May 20 18:33:09 2018 + Commit: Matt Turner gentoo org> CommitDate: Sun May 20 18:33:09 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a5fd84 x11-libs/libxcb: Drop old versions x11-libs/libxcb/Manifest | 1 - ...ll-headers-man-pages-for-disabled-extensi.patch | 257 - ...bxcb-1.12-fix-inconsistent-use-tabs-space.patch | 55 - x11-libs/libxcb/libxcb-1.12-r2.ebuild | 57 - 4 files changed, 370 deletions(-) diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest index 9f78262395e..aea3ef1bfbc 100644 --- a/x11-libs/libxcb/Manifest +++ b/x11-libs/libxcb/Manifest @@ -1,2 +1 @@ -DIST libxcb-1.12.tar.bz2 613822 BLAKE2B 61f164ba6fb9493fe0692badc74a2866ee08ce3c3499773be0bddf742d0ffc69bb876233aae46a7e76cb9263485eb007d105b16091a73750d490da0528482ff2 SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896 DIST libxcb-1.13.tar.bz2 510453 BLAKE2B 2bdae7610cb8b3fdefeded6cf457e1c397666d235114439caba114b9e7a6b2af50f2cd8363ebaa3ddfa5c5040b8cdf2960150e1f4db141c572e12b1a2fb0ca9a SHA512 d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c diff --git a/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch b/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch deleted file mode 100644 index 0f8aa119823..000 --- a/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch +++ /dev/null @@ -1,257 +0,0 @@ -From e9b5234b3b0b53bd3a35f947ddb8a72d03cf1825 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Cardona?= -Date: Mon, 29 Dec 2014 20:18:22 +0100 -Subject: [PATCH] Don't install headers/man pages for disabled extensions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -https://bugs.gentoo.org/show_bug.cgi?id=533906 - -Signed-off-by: RĂ©mi Cardona - src/Makefile.am | 52 ++-- - 1 file changed, 26 insertions(+), 26 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5a3c52a..774ad8e 100644 a/src/Makefile.am -+++ b/src/Makefile.am -@@ -24,208 +24,208 @@ XCB_LIBS = libxcb.la - - # FIXME: find a way to autogenerate this from the XML files. - --EXTSOURCES += composite.c - if BUILD_COMPOSITE -+EXTSOURCES += composite.c - lib_LTLIBRARIES += libxcb-composite.la - libxcb_composite_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_composite_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_composite_la_SOURCES = composite.c composite.h - endif - --EXTSOURCES += damage.c - if BUILD_DAMAGE -+EXTSOURCES += damage.c - lib_LTLIBRARIES += libxcb-damage.la - libxcb_damage_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_damage_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_damage_la_SOURCES = damage.c damage.h - endif - --EXTSOURCES += dpms.c - if BUILD_DPMS -+EXTSOURCES += dpms.c - lib_LTLIBRARIES += libxcb-dpms.la - libxcb_dpms_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_dpms_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_dpms_la_SOURCES = dpms.c dpms.h - endif - --EXTSOURCES += dri2.c - if BUILD_DRI2 -+EXTSOURCES += dri2.c - lib_LTLIBRARIES += libxcb-dri2.la - libxcb_dri2_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_dri2_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_dri2_la_SOURCES = dri2.c dri2.h - endif - --EXTSOURCES += dri3.c - if BUILD_DRI3 -+EXTSOURCES += dri3.c - lib_LTLIBRARIES += libxcb-dri3.la - libxcb_dri3_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_dri3_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_dri3_la_SOURCES = dri3.c dri3.h - endif - --EXTSOURCES += present.c - if BUILD_PRESENT -+EXTSOURCES += present.c - lib_LTLIBRARIES += libxcb-present.la - libxcb_present_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_present_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_present_la_SOURCES = present.c present.h - endif - --EXTSOURCES += glx.c - if BUILD_GLX - lib_LTLIBRARIES += libxcb-glx.la -+EXTSOURCES += glx.c - libxcb_glx_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ - libxcb_glx_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_glx_la_SOURCES = glx.c glx.h - endif - --EXTSOURCES += randr.c - if BUILD_RANDR -+EXTSOURCES += randr.c - lib_LTLIBRARIES += libxcb-randr.la - libxcb_randr_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@ - libxcb_randr_la_LIBADD = $(XCB_LIBS) - nodist_libxcb_randr_la_SOURCES = randr.c randr.h - endif - --EXTSOURCES += record.c - if BUILD_RECORD -+EXTSOURCES += record.c
[gentoo-commits] repo/gentoo:master commit in: x11-libs/libxcb/, x11-libs/libxcb/files/
commit: dedcc9328c85590dea6b46eeb64a6afd914b0f41 Author: Matt Turner gentoo org> AuthorDate: Sun Mar 12 03:33:39 2017 + Commit: Matt Turner gentoo org> CommitDate: Thu Mar 16 20:36:44 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedcc932 x11-libs/libxcb: Drop old versions x11-libs/libxcb/Manifest | 5 -- .../files/libxcb-1.11-xevie-xprint_removal.patch | 30 - 9.1-conflicting-types-for-xcb_ge_event_t.patch | 18 -- ...ist-object-has-no-attribute-lenfield_name.patch | 29 - x11-libs/libxcb/files/xcb-rebuilder.sh | 71 -- x11-libs/libxcb/libxcb-1.10.ebuild | 48 --- x11-libs/libxcb/libxcb-1.11-r1.ebuild | 57 - x11-libs/libxcb/libxcb-1.11.1.ebuild | 56 - x11-libs/libxcb/libxcb-1.11.ebuild | 52 x11-libs/libxcb/libxcb-1.12.ebuild | 57 - x11-libs/libxcb/libxcb-1.9.1-r1.ebuild | 60 -- x11-libs/libxcb/libxcb-1.9.1.ebuild| 45 -- x11-libs/libxcb/libxcb-1.9.3-r1.ebuild | 48 --- x11-libs/libxcb/libxcb-1.9.3.ebuild| 46 -- 14 files changed, 622 deletions(-) diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest index c5bef712867..dc3c23b8b5c 100644 --- a/x11-libs/libxcb/Manifest +++ b/x11-libs/libxcb/Manifest @@ -1,6 +1 @@ -DIST libxcb-1.10.tar.bz2 475211 SHA256 98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5 SHA512 c29ab5027498635d58fd7bfcd77899a406116b25fa8c4ec6513fc1395d8a0f99f602ad20b507660a62000b6fc879860d182cafd29af590e8b14f55150a064f7a WHIRLPOOL 4e11ffa276ef717e8f14183385413b30b52e8848669bf0f3075fb82adf4a4e94d8a98a2505797be055ff9f546e4fc11e94ba148099b6a0c2998da3e0f20fe99a -DIST libxcb-1.11.1.tar.bz2 519517 SHA256 b720fd6c7d200e5371affdb3f049cc8f88cff9aed942ff1b824d95eedbf69d30 SHA512 30471b053097d68008142bada9ca3efd9121305f0180d28a5ca9b62821f711a3ad63a667bdfb31f8f97020ed7aa9509f8248effbd65c80e6cda7375135dc96eb WHIRLPOOL 3e4fe9611e80d81652f375219829f19d4fa8e8a8e8d3b48cc217f7d652fcf84754ac735ce5adbc7092df079a6329a3af4cbdee7bd29e3009a35abbdb6ffc6792 -DIST libxcb-1.11.tar.bz2 517700 SHA256 03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7 SHA512 718f9a44a621daae93eb94dc7b795743253c801ea98efd2041794823fdc8f5eeb031b1fa7d34b72e7a8fccf850d98f2373a49927c8d3198c1d4850af6ae14bb1 WHIRLPOOL 11e9bf3445977570884006de01a2ed44caf273c27d7d9908307cc81d82bba9995de6a0a3c3ef62bd9a06f56e977310616dc7eda909409d199b52305b2b4b0e36 DIST libxcb-1.12.tar.bz2 613822 SHA256 4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b SHA512 4ce3e3f62b7e1c3a9e61c149c720ef2a4a760539ea615d7d52ae39e7f5a08456dc87d7a1ac5d85ca15dcc468a9a02d56fb8f8f6361c959af9b8780f011995896 WHIRLPOOL b2dd2d6e441c20458c9a4a372f9bb336dd2bbd2865de7b63cc223977af86cf80f13f0afb42f3e71bb1ad6b9ea10dc62df9df5e12c54f7822087fad0c107adf87 -DIST libxcb-1.9.1.tar.bz2 373312 SHA256 d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f SHA512 541d6e07b1a0da61c3cc1dbdae50ce4e55f1a27e79e277db5af192d02c8360bb3958c597d6692f2c6afcf009ae7b312459f65e8c8d2f1bcc446f7f512bacdd41 WHIRLPOOL cc2af531d5beddec577507d4cf983262069144d7e9667958ce03bba6ceebb907488ddf475253e856b879e81333cfac8bfbc2c8092d60fbfa49a3b447af6e6f68 -DIST libxcb-1.9.3.tar.bz2 400283 SHA256 aad09d223fcb5bd345ce4d1737f178a557b6f2e201128e1ee3c83af46028018b SHA512 796673c8df6bf0e3e1f847a3d565502b4ff4e4981c9104c6ca0367d7a15bffd266860dfb545366a4d96695efd060afe205b990983e08b4da8470a7f0a8d4a7a1 WHIRLPOOL 6de787900ef93c13d304739862b04d6c582dbafeebadf9b260064da92821f0681198364265fe5bcaf12f34f9a9020e3ad7e2dbbdb7cd627a909d803105df2f8b diff --git a/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch b/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch deleted file mode 100644 index e8c24d34b23..000 --- a/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch +++ /dev/null @@ -1,30 +0,0 @@ -Both extensions have been dropped from the X-Server in 2008: -http://cgit.freedesktop.org/xorg/xserver/commit/?id=1c8bd31 -http://cgit.freedesktop.org/xorg/xserver/commit/?id=f4036f6 - -Don't build them by default. - -Reviewed-by: Julien Cristau -Signed-off-by: Daniel Martin -Signed-off-by: Uli Schlachter - -diff --git a/a/configure.ac b/b/configure.ac -index eb4a971..c9a1e91 100644 a/a/configure.ac -+++ b/b/configure.ac -@@ -227,13 +227,13 @@ XCB_EXTENSION(Screensaver, "yes") - XCB_EXTENSION(Shape, "yes") - XCB_EXTENSION(Shm, "yes") - XCB_EXTENSION(Sync, "yes") --XCB_EXTENSION(Xevie, "yes") -+XCB_EXTENSION(Xevie, "no") - XCB_EXTENSION(XFixes, "yes") - XCB_EXTENSION(XFree86-DRI, "yes") - XCB_EXTENSION(Xinerama, "yes") - XCB_EXTENSION(XInput, "no") - XCB_EXTENSION(XKB, "yes") --XCB_EXTENSION(Xprint, "yes") -+XCB_EXTENSION(Xpr