Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libxml2 merge python binding
@ 2022-02-24 15:59 sgn
  2022-03-01  2:35 ` [PR PATCH] [Updated] " sgn
  2022-03-01  2:35 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2022-02-24 15:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages libxml2-merge-python-binding
https://github.com/void-linux/void-packages/pull/35829

libxml2 merge python binding
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxml2-merge-python-binding-35829.patch --]
[-- Type: text/x-diff, Size: 6145 bytes --]

From a68f45072eed15c18fd03323a1d18515c4241073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 23 Feb 2022 09:39:01 +0700
Subject: [PATCH 1/2] libxml2: change homepage, merge libxml2-python3 back

The homepage was picked up from specs file.
---
 srcpkgs/libxml2-python3                       |  1 +
 srcpkgs/libxml2-python3/template              | 26 -----------------
 .../patches/python3-utf8.patch                |  0
 srcpkgs/libxml2/template                      | 28 +++++++++++++------
 4 files changed, 20 insertions(+), 35 deletions(-)
 create mode 120000 srcpkgs/libxml2-python3
 delete mode 100644 srcpkgs/libxml2-python3/template
 rename srcpkgs/{libxml2-python3 => libxml2}/patches/python3-utf8.patch (100%)

diff --git a/srcpkgs/libxml2-python3 b/srcpkgs/libxml2-python3
new file mode 120000
index 000000000000..0ccd6d6e543a
--- /dev/null
+++ b/srcpkgs/libxml2-python3
@@ -0,0 +1 @@
+libxml2
\ No newline at end of file
diff --git a/srcpkgs/libxml2-python3/template b/srcpkgs/libxml2-python3/template
deleted file mode 100644
index 4db662975d2a..000000000000
--- a/srcpkgs/libxml2-python3/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libxml2-python3'
-pkgname=libxml2-python3
-version=2.9.13
-revision=1
-wrksrc="libxml2-${version}"
-build_wrksrc=python
-build_style=python3-module
-hostmakedepends="python3-devel"
-makedepends="libxml2-devel python3-devel"
-depends="python3"
-short_desc="Library providing XML and HTML support - Python3 bindings"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="http://www.xmlsoft.org/"
-distfiles="https://download.gnome.org/sources/libxml2/${version%.*}/libxml2-${version}.tar.xz"
-checksum=276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e
-
-post_patch() {
-	if [ "${CROSS_BUILD}" ]; then
-		vsed -i setup.py -e "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:"
-	fi
-}
-
-post_install() {
-	vlicense ../COPYING
-}
diff --git a/srcpkgs/libxml2-python3/patches/python3-utf8.patch b/srcpkgs/libxml2/patches/python3-utf8.patch
similarity index 100%
rename from srcpkgs/libxml2-python3/patches/python3-utf8.patch
rename to srcpkgs/libxml2/patches/python3-utf8.patch
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index e2d76ceec885..edf05f9af89f 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,22 +1,23 @@
 # Template file for 'libxml2'
-#
-# Please keep this in sync with "srcpkgs/libxml2-python3"
-#
 pkgname=libxml2
 version=2.9.13
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-threads --with-history --with-icu --without-python"
-hostmakedepends="gettext pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel icu-devel"
+configure_args="--with-threads --with-history --with-icu"
+hostmakedepends="gettext pkg-config python3"
+makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel icu-devel
+ python3-devel"
 short_desc="Library providing XML and HTML support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
-homepage="http://www.xmlsoft.org/"
-distfiles="https://download.gnome.org/sources/libxml2/${version%.*}/libxml2-${version}.tar.xz"
+homepage="https://gitlab.gnome.org/GNOME/libxml2"
+distfiles="${GNOME_SITE}/libxml2/${version%.*}/libxml2-${version}.tar.xz"
 checksum=276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e
+python_version=3
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
 
 post_install() {
+	rm -f ${DESTDIR}/${py3_lib}/*.a
 	vlicense COPYING
 }
 
@@ -35,6 +36,15 @@ libxml2-devel_package() {
 		vmove "usr/share/man/man1/xml2-config*"
 		vmove usr/share/man/man3
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.la"
 		vmove "usr/lib/*.so"
 	}
 }
+
+libxml2-python3_package() {
+	depends="python3"
+	short_desc+=" - Python bindings"
+	pkg_install() {
+		vmove "${py3_lib}"
+	}
+}

From d132942376b15022fae8498865c33a9931a7a761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 23 Feb 2022 10:04:27 +0700
Subject: [PATCH 2/2] libxslt: change homepage, build python 3 bindings

homepage picked from specs file.
---
 srcpkgs/libxslt-python3  |  1 +
 srcpkgs/libxslt/template | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/libxslt-python3

diff --git a/srcpkgs/libxslt-python3 b/srcpkgs/libxslt-python3
new file mode 120000
index 000000000000..fbcaa3cb7ad9
--- /dev/null
+++ b/srcpkgs/libxslt-python3
@@ -0,0 +1 @@
+libxslt
\ No newline at end of file
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index fbede2817bf5..132f6c86fbe3 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,18 +1,19 @@
 # Template file for 'libxslt'
 pkgname=libxslt
 version=1.1.35
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-dependency-tracking"
-hostmakedepends="docbook-xml docbook-xsl libtool pkg-config"
-makedepends="libxml2-devel libgcrypt-devel"
+hostmakedepends="docbook-xml docbook-xsl libtool pkg-config python3"
+makedepends="libxml2-devel libgcrypt-devel python3-devel"
 short_desc="XSLT parser library from the GNOME project"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://xmlsoft.org/XSLT/"
-distfiles="https://download.gnome.org/sources/libxslt/${version%.*}/libxslt-${version}.tar.xz"
+homepage="https://gitlab.gnome.org/GNOME/libxslt"
+distfiles="${GNOME_SITE}/libxslt/${version%.*}/libxslt-${version}.tar.xz"
 checksum=8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79
 python_version=3
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libxslt"
@@ -58,5 +59,15 @@ libxslt-devel_package() {
 		vmove usr/share/aclocal
 		vmove usr/share/doc
 		vmove usr/share/man/man3
+		vmove usr/share/gtk-doc
+		vmove usr/lib/cmake
+	}
+}
+
+libxslt-python3_package() {
+	depends="python3"
+	short_desc+=" - Python 3 bindings"
+	pkg_install() {
+		vmove "${py3_lib}"
 	}
 }

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

* Re: [PR PATCH] [Updated] libxml2 merge python binding
  2022-02-24 15:59 [PR PATCH] libxml2 merge python binding sgn
@ 2022-03-01  2:35 ` sgn
  2022-03-01  2:35 ` [PR PATCH] [Merged]: " sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2022-03-01  2:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages libxml2-merge-python-binding
https://github.com/void-linux/void-packages/pull/35829

libxml2 merge python binding
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxml2-merge-python-binding-35829.patch --]
[-- Type: text/x-diff, Size: 6195 bytes --]

From fd4729c42d75aa8006c53abf4d65dbef34877d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 23 Feb 2022 09:39:01 +0700
Subject: [PATCH 1/2] libxml2: change homepage, merge libxml2-python3 back

The homepage was picked up from specs file.
---
 srcpkgs/libxml2-python3                       |  1 +
 srcpkgs/libxml2-python3/template              | 26 -----------------
 .../patches/python3-utf8.patch                |  0
 srcpkgs/libxml2/template                      | 28 +++++++++++++------
 4 files changed, 20 insertions(+), 35 deletions(-)
 create mode 120000 srcpkgs/libxml2-python3
 delete mode 100644 srcpkgs/libxml2-python3/template
 rename srcpkgs/{libxml2-python3 => libxml2}/patches/python3-utf8.patch (100%)

diff --git a/srcpkgs/libxml2-python3 b/srcpkgs/libxml2-python3
new file mode 120000
index 000000000000..0ccd6d6e543a
--- /dev/null
+++ b/srcpkgs/libxml2-python3
@@ -0,0 +1 @@
+libxml2
\ No newline at end of file
diff --git a/srcpkgs/libxml2-python3/template b/srcpkgs/libxml2-python3/template
deleted file mode 100644
index 4db662975d2a..000000000000
--- a/srcpkgs/libxml2-python3/template
+++ /dev/null
@@ -1,26 +0,0 @@
-# Template file for 'libxml2-python3'
-pkgname=libxml2-python3
-version=2.9.13
-revision=1
-wrksrc="libxml2-${version}"
-build_wrksrc=python
-build_style=python3-module
-hostmakedepends="python3-devel"
-makedepends="libxml2-devel python3-devel"
-depends="python3"
-short_desc="Library providing XML and HTML support - Python3 bindings"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="http://www.xmlsoft.org/"
-distfiles="https://download.gnome.org/sources/libxml2/${version%.*}/libxml2-${version}.tar.xz"
-checksum=276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e
-
-post_patch() {
-	if [ "${CROSS_BUILD}" ]; then
-		vsed -i setup.py -e "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:"
-	fi
-}
-
-post_install() {
-	vlicense ../COPYING
-}
diff --git a/srcpkgs/libxml2-python3/patches/python3-utf8.patch b/srcpkgs/libxml2/patches/python3-utf8.patch
similarity index 100%
rename from srcpkgs/libxml2-python3/patches/python3-utf8.patch
rename to srcpkgs/libxml2/patches/python3-utf8.patch
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index e2d76ceec885..be660f81aa0e 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,22 +1,23 @@
 # Template file for 'libxml2'
-#
-# Please keep this in sync with "srcpkgs/libxml2-python3"
-#
 pkgname=libxml2
 version=2.9.13
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-threads --with-history --with-icu --without-python"
-hostmakedepends="gettext pkg-config"
-makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel icu-devel"
+configure_args="--with-threads --with-history --with-icu"
+hostmakedepends="gettext pkg-config python3"
+makedepends="zlib-devel ncurses-devel readline-devel liblzma-devel icu-devel
+ python3-devel"
 short_desc="Library providing XML and HTML support"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="MIT"
-homepage="http://www.xmlsoft.org/"
-distfiles="https://download.gnome.org/sources/libxml2/${version%.*}/libxml2-${version}.tar.xz"
+homepage="https://gitlab.gnome.org/GNOME/libxml2"
+distfiles="${GNOME_SITE}/libxml2/${version%.*}/libxml2-${version}.tar.xz"
 checksum=276130602d12fe484ecc03447ee5e759d0465558fbc9d6bd144e3745306ebf0e
+python_version=3
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
 
 post_install() {
+	rm -f ${DESTDIR}/${py3_lib}/*.a
 	vlicense COPYING
 }
 
@@ -35,6 +36,15 @@ libxml2-devel_package() {
 		vmove "usr/share/man/man1/xml2-config*"
 		vmove usr/share/man/man3
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.la"
 		vmove "usr/lib/*.so"
 	}
 }
+
+libxml2-python3_package() {
+	depends="python3 ${sourcepkg}>=${version}"
+	short_desc+=" - Python bindings"
+	pkg_install() {
+		vmove "${py3_lib}"
+	}
+}

From 105de5a836c3ee7e4dae262692f8e2f011d6cb74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 23 Feb 2022 10:04:27 +0700
Subject: [PATCH 2/2] libxslt: change homepage, build python 3 bindings

homepage picked from specs file.
---
 srcpkgs/libxslt-python3  |  1 +
 srcpkgs/libxslt/template | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)
 create mode 120000 srcpkgs/libxslt-python3

diff --git a/srcpkgs/libxslt-python3 b/srcpkgs/libxslt-python3
new file mode 120000
index 000000000000..fbcaa3cb7ad9
--- /dev/null
+++ b/srcpkgs/libxslt-python3
@@ -0,0 +1 @@
+libxslt
\ No newline at end of file
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index fbede2817bf5..ec65d71f1974 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,18 +1,19 @@
 # Template file for 'libxslt'
 pkgname=libxslt
 version=1.1.35
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-static --disable-dependency-tracking"
-hostmakedepends="docbook-xml docbook-xsl libtool pkg-config"
-makedepends="libxml2-devel libgcrypt-devel"
+hostmakedepends="docbook-xml docbook-xsl libtool pkg-config python3"
+makedepends="libxml2-devel libgcrypt-devel python3-devel"
 short_desc="XSLT parser library from the GNOME project"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
-homepage="http://xmlsoft.org/XSLT/"
-distfiles="https://download.gnome.org/sources/libxslt/${version%.*}/libxslt-${version}.tar.xz"
+homepage="https://gitlab.gnome.org/GNOME/libxslt"
+distfiles="${GNOME_SITE}/libxslt/${version%.*}/libxslt-${version}.tar.xz"
 checksum=8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79
 python_version=3
+CFLAGS="-I$XBPS_CROSS_BASE/usr/include/python$py3_ver"
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libxslt"
@@ -58,5 +59,15 @@ libxslt-devel_package() {
 		vmove usr/share/aclocal
 		vmove usr/share/doc
 		vmove usr/share/man/man3
+		vmove usr/share/gtk-doc
+		vmove usr/lib/cmake
+	}
+}
+
+libxslt-python3_package() {
+	depends="python3 ${sourcepkg}>=${version}"
+	short_desc+=" - Python 3 bindings"
+	pkg_install() {
+		vmove "${py3_lib}"
 	}
 }

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

* Re: [PR PATCH] [Merged]: libxml2 merge python binding
  2022-02-24 15:59 [PR PATCH] libxml2 merge python binding sgn
  2022-03-01  2:35 ` [PR PATCH] [Updated] " sgn
@ 2022-03-01  2:35 ` sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2022-03-01  2:35 UTC (permalink / raw)
  To: ml

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

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

libxml2 merge python binding
https://github.com/void-linux/void-packages/pull/35829

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

end of thread, other threads:[~2022-03-01  2:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-24 15:59 [PR PATCH] libxml2 merge python binding sgn
2022-03-01  2:35 ` [PR PATCH] [Updated] " sgn
2022-03-01  2:35 ` [PR PATCH] [Merged]: " sgn

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).