[PR PATCH] libX11: update to 1.6.9.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] libX11: update to 1.6.9.
@ 2019-10-12 21:20 voidlinux-github
  2019-10-12 22:21 ` voidlinux-github
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-12 21:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

There is a new pull request by steinex against master on the void-packages repository

https://github.com/steinex/void-packages libX11
https://github.com/void-linux/void-packages/pull/15422

libX11: update to 1.6.9.


A patch file from https://github.com/void-linux/void-packages/pull/15422.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libX11-15422.patch --]
[-- Type: text/x-diff, Size: 1062 bytes --]

From 67b0adbc5ca736b140b7fd816d04eee5ad469adb Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinborn@sipgate.de>
Date: Sat, 12 Oct 2019 23:12:15 +0200
Subject: [PATCH] libX11: update to 1.6.9.

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 37109ba0260..9a5799e66f6 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.6.8
+version=1.6.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="maxice8 <thinkbit.ukim@gmail.com>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5
+checksum=9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool automake xorgproto xtrans"

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: libX11: update to 1.6.9.
  2019-10-12 21:20 [PR PATCH] libX11: update to 1.6.9 voidlinux-github
@ 2019-10-12 22:21 ` voidlinux-github
  2019-10-12 22:36 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-12 22:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

New comment by prspkt on void-packages repository

https://github.com/void-linux/void-packages/pull/15422#issuecomment-541366097

Comment:
`libX11-devel` now provides `/usr/include/X11/extensions/XKBgeom.h` which is also provided by `xorgproto`. It probably needs to be removed from `xorgproto` to avoid collisions.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] libX11: update to 1.6.9.
  2019-10-12 21:20 [PR PATCH] libX11: update to 1.6.9 voidlinux-github
  2019-10-12 22:21 ` voidlinux-github
@ 2019-10-12 22:36 ` voidlinux-github
  2019-10-12 22:36 ` voidlinux-github
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-12 22:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is an updated pull request by steinex against master on the void-packages repository

https://github.com/steinex/void-packages libX11
https://github.com/void-linux/void-packages/pull/15422

libX11: update to 1.6.9.


A patch file from https://github.com/void-linux/void-packages/pull/15422.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libX11-15422.patch --]
[-- Type: text/x-diff, Size: 2099 bytes --]

From 67b0adbc5ca736b140b7fd816d04eee5ad469adb Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinborn@sipgate.de>
Date: Sat, 12 Oct 2019 23:12:15 +0200
Subject: [PATCH 1/2] libX11: update to 1.6.9.

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 37109ba0260..9a5799e66f6 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.6.8
+version=1.6.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="maxice8 <thinkbit.ukim@gmail.com>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5
+checksum=9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool automake xorgproto xtrans"

From fb7b7126e7e321e104d92cb5b3eeb74b29e32764 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 13 Oct 2019 00:36:16 +0200
Subject: [PATCH 2/2] xorgproto: remove XKBgeom.h, provided by libX11-devel now

---
 srcpkgs/xorgproto/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 53a7e063a08..460d74fc855 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,7 +1,7 @@
 # Template file for 'xorgproto'
 pkgname=xorgproto
 version=2019.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-legacy"
 hostmakedepends="xorg-util-macros"
@@ -52,4 +52,7 @@ post_install() {
 	rm -f ${DESTDIR}/usr/include/X11/extensions/{apple,windows}*
 	rm -f ${DESTDIR}/usr/share/licenses/${pkgname}/COPYING-{apple,windows}wmproto
 	rm -f ${DESTDIR}/usr/share/pkgconfig/{apple,windows}wmproto.pc
+
+	# provided by libX11-devel
+	rm -f ${DESTDIR}/usr/include/X11/extensions/XKBgeom.h
 }

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] libX11: update to 1.6.9.
  2019-10-12 21:20 [PR PATCH] libX11: update to 1.6.9 voidlinux-github
  2019-10-12 22:21 ` voidlinux-github
  2019-10-12 22:36 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-12 22:36 ` voidlinux-github
  2019-10-12 22:37 ` voidlinux-github
  2019-10-14 16:47 ` [PR PATCH] [Merged]: " voidlinux-github
  4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-12 22:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

There is an updated pull request by steinex against master on the void-packages repository

https://github.com/steinex/void-packages libX11
https://github.com/void-linux/void-packages/pull/15422

libX11: update to 1.6.9.


A patch file from https://github.com/void-linux/void-packages/pull/15422.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libX11-15422.patch --]
[-- Type: text/x-diff, Size: 2099 bytes --]

From 67b0adbc5ca736b140b7fd816d04eee5ad469adb Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinborn@sipgate.de>
Date: Sat, 12 Oct 2019 23:12:15 +0200
Subject: [PATCH 1/2] libX11: update to 1.6.9.

---
 srcpkgs/libX11/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libX11/template b/srcpkgs/libX11/template
index 37109ba0260..9a5799e66f6 100644
--- a/srcpkgs/libX11/template
+++ b/srcpkgs/libX11/template
@@ -1,6 +1,6 @@
 # Template file for 'libX11'
 pkgname=libX11
-version=1.6.8
+version=1.6.9
 revision=1
 build_style=gnu-configure
 configure_args="--enable-ipv6 --enable-xlocaledir --without-xmlto
@@ -12,7 +12,7 @@ maintainer="maxice8 <thinkbit.ukim@gmail.com>"
 license="MIT"
 homepage="http://xorg.freedesktop.org/"
 distfiles="${XORG_SITE}/lib/${pkgname}-${version}.tar.bz2"
-checksum=b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5
+checksum=9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libtool automake xorgproto xtrans"

From fb7b7126e7e321e104d92cb5b3eeb74b29e32764 Mon Sep 17 00:00:00 2001
From: Frank Steinborn <steinex@nognu.de>
Date: Sun, 13 Oct 2019 00:36:16 +0200
Subject: [PATCH 2/2] xorgproto: remove XKBgeom.h, provided by libX11-devel now

---
 srcpkgs/xorgproto/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 53a7e063a08..460d74fc855 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,7 +1,7 @@
 # Template file for 'xorgproto'
 pkgname=xorgproto
 version=2019.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-legacy"
 hostmakedepends="xorg-util-macros"
@@ -52,4 +52,7 @@ post_install() {
 	rm -f ${DESTDIR}/usr/include/X11/extensions/{apple,windows}*
 	rm -f ${DESTDIR}/usr/share/licenses/${pkgname}/COPYING-{apple,windows}wmproto
 	rm -f ${DESTDIR}/usr/share/pkgconfig/{apple,windows}wmproto.pc
+
+	# provided by libX11-devel
+	rm -f ${DESTDIR}/usr/include/X11/extensions/XKBgeom.h
 }

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: libX11: update to 1.6.9.
  2019-10-12 21:20 [PR PATCH] libX11: update to 1.6.9 voidlinux-github
                   ` (2 preceding siblings ...)
  2019-10-12 22:36 ` voidlinux-github
@ 2019-10-12 22:37 ` voidlinux-github
  2019-10-14 16:47 ` [PR PATCH] [Merged]: " voidlinux-github
  4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-12 22:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 336 bytes --]

New comment by steinex on void-packages repository

https://github.com/void-linux/void-packages/pull/15422#issuecomment-541366965

Comment:
> `libX11-devel` now provides `/usr/include/X11/extensions/XKBgeom.h` which is also provided by `xorgproto`. It probably needs to be removed from `xorgproto` to avoid collisions.

Thanks, done.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Merged]: libX11: update to 1.6.9.
  2019-10-12 21:20 [PR PATCH] libX11: update to 1.6.9 voidlinux-github
                   ` (3 preceding siblings ...)
  2019-10-12 22:37 ` voidlinux-github
@ 2019-10-14 16:47 ` voidlinux-github
  4 siblings, 0 replies; 6+ messages in thread
From: voidlinux-github @ 2019-10-14 16:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

There's a merged pull request on the void-packages repository

libX11: update to 1.6.9.
https://github.com/void-linux/void-packages/pull/15422

Description:


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-10-14 16:47 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-12 21:20 [PR PATCH] libX11: update to 1.6.9 voidlinux-github
2019-10-12 22:21 ` voidlinux-github
2019-10-12 22:36 ` [PR PATCH] [Updated] " voidlinux-github
2019-10-12 22:36 ` voidlinux-github
2019-10-12 22:37 ` voidlinux-github
2019-10-14 16:47 ` [PR PATCH] [Merged]: " voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).