Skip to contentSkip to conversation

package/x11r7/xapp_xkbcomp: bump version to 1.4.3

PATCH New Bernd Kuhls 2 participants 4 messages Mar 9, 2020 – Mar 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/x11r7/xapp_xkbcomp: bump version to 1.4.3

---
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash | 8 +++-----
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)
package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +3 -5
index 86fd033e3e..98bd0c43a3 100644
@@ -1,7 +1,5 @@
-# From https://lists.x.org/archives/xorg-announce/2018-June/002901.html
-md5 12610df19df2af3797f2c130ee2bce97  xkbcomp-1.4.2.tar.bz2
-sha1 9a39cf7a562c152465e04fc7cf1002c59f883870  xkbcomp-1.4.2.tar.bz2
-sha256 6dd8bcb9be7e85bd7294abe261b8c7b0539d2fc93e41b80fb8bd013767ce8424  xkbcomp-1.4.2.tar.bz2
-sha512 b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e  xkbcomp-1.4.2.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2020-February/003037.html
+sha256 06242c169fc11caf601cac46d781d467748c6a330e15b36dce46520b8ac8d435  xkbcomp-1.4.3.tar.bz2
+sha512 827713c0413aecdcad2b61edb7b8c7c7a002e18505b9041f570e2f680907193cb5ff8a5b424695e21110b2d06c145cbf0e397e52347421ee946f06e2a51f135d  xkbcomp-1.4.3.tar.bz2
 # Locally computed
 sha256 f1a78f5796fe2374f2b93e579328a02283e57d2a8316484b31799b12debe7ee3  COPYING
package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +1 -1
index 9fcd8c0581..e97f8fdd8b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XKBCOMP_VERSION = 1.4.2
+XAPP_XKBCOMP_VERSION = 1.4.3
 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBCOMP_LICENSE = MIT
Signature · 1 line
2.25.0
#1 lore raw

PATCH 2/3 package/x11r7/xcb-proto: bump version to 1.14

Follow upstream switch to xz tarball:
https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/6d846028718206769d6b70c96239b926e782b4aa

Removed XCB_PROTO_POST_INSTALL_STAGING_HOOKS, not needed anymore due to upstream fix:
https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/bd7a481a3bee9283277badda95730f52185127bc

---
 package/x11r7/xcb-proto/xcb-proto.hash |  8 +++-----
 package/x11r7/xcb-proto/xcb-proto.mk   | 14 ++------------
 2 files changed, 5 insertions(+), 17 deletions(-)
package/x11r7/xcb-proto/xcb-proto.hash +3 -5
index b2ef3ee20b..c6d2d8e341 100644
@@ -1,7 +1,5 @@
-# From https://lists.x.org/archives/xorg-announce/2018-March/002852.html
-md5 abe9aa4886138150bbc04ae4f29b90e3  xcb-proto-1.13.tar.bz2
-sha1 f7fa35ab59af18cecadbe83fe705281dcfd82ffd  xcb-proto-1.13.tar.bz2
-sha256 7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1  xcb-proto-1.13.tar.bz2
-sha512 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7  xcb-proto-1.13.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2020-February/003038.html
+sha256 186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605  xcb-proto-1.14.tar.xz
+sha512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690  xcb-proto-1.14.tar.xz
 # Locally computed
 sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd  COPYING
package/x11r7/xcb-proto/xcb-proto.mk +2 -12
index b85dad7f2c..f7a3ad55b1 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-XCB_PROTO_VERSION = 1.13
-XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2
+XCB_PROTO_VERSION = 1.14
+XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.xz
 XCB_PROTO_SITE = http://xcb.freedesktop.org/dist
 XCB_PROTO_LICENSE = MIT
 XCB_PROTO_LICENSE_FILES = COPYING
@@ -15,15 +15,5 @@ XCB_PROTO_INSTALL_STAGING = YES
 XCB_PROTO_DEPENDENCIES = host-python
 HOST_XCB_PROTO_DEPENDENCIES = host-python
 
-# xcbincludedir/pythondir is used by E.G. libxcb at build time to find the
-# xml / python files, so ensure these expand to their full (host) paths
-define XCB_PROTO_FIXUP_PC_FILE
-	$(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_DIR)|' \
-		-e 's|^\(pythondir=\)|\1$(STAGING_DIR)|' \
-		$(STAGING_DIR)/usr/lib/pkgconfig/xcb-proto.pc
-endef
-
-XCB_PROTO_POST_INSTALL_STAGING_HOOKS += XCB_PROTO_FIXUP_PC_FILE
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
2.25.0
#2 lore raw

PATCH 3/3 package/x11r7/libxcb: bump version to 1.14

In reply to Bernd Kuhls

Follow upstream switch to xz tarball:
https://gitlab.freedesktop.org/xorg/lib/libxcb/-/commit/78c492deaa7ae3aad0b0eeb4b126bb291cc637a7

Removed dependency to libpthread-stubs, not needed anymore due to upstream commit:
https://gitlab.freedesktop.org/xorg/lib/libxcb/-/commit/8f7e4c4e9fc6ee6b5b5498a7d8af79150be0d26a

---
 package/x11r7/libxcb/Config.in   | 1 -
 package/x11r7/libxcb/libxcb.hash | 7 +++----
 package/x11r7/libxcb/libxcb.mk   | 8 ++++----
 3 files changed, 7 insertions(+), 9 deletions(-)
package/x11r7/libxcb/Config.in +0 -1
index 7439741f0a..e15dde3bb1 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBXCB
 	bool "libxcb"
-	select BR2_PACKAGE_LIBPTHREAD_STUBS
 	select BR2_PACKAGE_XCB_PROTO
 	select BR2_PACKAGE_XLIB_LIBXDMCP
 	select BR2_PACKAGE_XLIB_LIBXAU
package/x11r7/libxcb/libxcb.hash +3 -4
index 9158b6bb24..1861ef8a6b 100644
@@ -1,6 +1,5 @@
-# From https://lists.x.org/archives/xorg/2018-September/059469.html
-md5 f33cdfc67346f7217a9326c0d8679975  libxcb-1.13.1.tar.bz2
-sha1 2ab17a1bb2a44e0a9cb0b26bcf899689ba1bbb3b  libxcb-1.13.1.tar.bz2
-sha256 a89fb7af7a11f43d2ce84a844a4b38df688c092bf4b67683aef179cdf2a647c4  libxcb-1.13.1.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2020-February/003039.html
+sha256 a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34  libxcb-1.14.tar.xz
+sha512 b90a23204b0d2c29d8b115577edb01df0465e02d6a8876550fecd62375d24a5d5f872ddd5946772ddba077cadce75b12c7a6d218469dc30b5b92bc82188e8bc6  libxcb-1.14.tar.xz
 # Locally computed
 sha256 c5ffbfeaa501071ceeb97b7de2c0d703fdaa35de01c0fb6cbac1c28453a3e9fd  COPYING
package/x11r7/libxcb/libxcb.mk +4 -4
index fdc65cefc0..fb691c2422 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBXCB_VERSION = 1.13.1
-LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2
+LIBXCB_VERSION = 1.14
+LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.xz
 LIBXCB_SITE = http://xcb.freedesktop.org/dist
 LIBXCB_LICENSE = MIT
 LIBXCB_LICENSE_FILES = COPYING
@@ -13,10 +13,10 @@ LIBXCB_LICENSE_FILES = COPYING
 LIBXCB_INSTALL_STAGING = YES
 
 LIBXCB_DEPENDENCIES = \
-	host-libxslt libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \
+	host-libxslt xcb-proto xlib_libXdmcp xlib_libXau \
 	host-xcb-proto host-python host-pkgconf
 HOST_LIBXCB_DEPENDENCIES = \
-	host-libxslt host-libpthread-stubs host-xcb-proto host-xlib_libXdmcp \
+	host-libxslt host-xcb-proto host-xlib_libXdmcp \
 	host-xlib_libXau host-python host-pkgconf
 
 LIBXCB_CONF_OPTS = --with-doxygen=no
Signature · 1 line
2.25.0
#3 lore raw

PATCH 1/3 package/x11r7/xapp_xkbcomp: bump version to 1.4.3

In reply to Bernd Kuhls
Quoted 5 lines · On Mon, 9 Mar 2020 20:35:21 +0100 Bernd Kuhls <[email protected]> wrote:
---
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash | 8 +++-----
 package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

Series applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com