* Re: [PR PATCH] [Updated] bamf: update to 0.5.5.
2022-01-07 17:17 [PR PATCH] bamf: update to 0.5.5 paper42
@ 2022-01-09 13:28 ` paper42
2022-01-10 22:33 ` [PR PATCH] [Merged]: " paper42
1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-01-09 13:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1219 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages bamf-0.5.5
https://github.com/void-linux/void-packages/pull/34925
bamf: update to 0.5.5.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### 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/34925.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bamf-0.5.5-34925.patch --]
[-- Type: text/x-diff, Size: 9818 bytes --]
From 144e31894c7c1a0460765dc6bdba9b4daa0a29ee Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 6 Jan 2022 23:13:13 +0100
Subject: [PATCH 1/4] bamf: update to 0.5.5.
---
srcpkgs/bamf/template | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/bamf/template b/srcpkgs/bamf/template
index e71e50d826f2..b0f8a2aa5e92 100644
--- a/srcpkgs/bamf/template
+++ b/srcpkgs/bamf/template
@@ -1,27 +1,31 @@
# Template file for 'bamf'
pkgname=bamf
-version=0.5.4
-revision=4
+version=0.5.5
+revision=1
build_style=gnu-configure
build_helper="gir"
-hostmakedepends="glib-devel gtk-doc pkg-config python-lxml libxslt-python libxml2-python
- $(vopt_if vala vala)"
-makedepends="libglib-devel libgtop-devel libwnck-devel"
+configure_args="$(vopt_with gtk_doc gtk-doc)"
+hostmakedepends="glib-devel gtk-doc pkg-config automake libtool
+ $(vopt_if vala vala) gnome-common which"
+makedepends="libglib-devel libgtop-devel libwnck-devel gtk+3-devel"
short_desc="Application matching framework"
maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
license="LGPL-3.0-only, LGPL-2.1-only, GPL-3.0-or-later"
homepage="https://launchpad.net/bamf"
-distfiles="https://launchpad.net/bamf/${version%.*}/${version}/+download/${pkgname}-${version}.tar.gz"
-checksum=5bb87a5bf46ab1fc9a229a851c0ee4f610d943716a7c83d318f6a8f50d76beb3
+distfiles="https://launchpad.net/bamf/${version%.*}/${version}/+download/bamf-${version}.tar.xz"
+checksum=10e642adf5169d46e32b113346bebdad437cddd1ddbd45d16c640cf60cabf5da
CFLAGS="-Wno-cpp -Wno-deprecated-declarations"
build_options="gir vala"
build_options_default="gir vala"
+if [ -z "$CROSS_BUILD" ]; then
+ build_options_default+=" gtk_doc"
+fi
+
pre_configure() {
- sed -i configure -e 's;if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null);if false;'
- sed -i configure -e '/CFLAGS=/s/ \-Werror / /'
+ NOCONFIGURE=1 ./autogen.sh
}
bamf-devel_package() {
@@ -31,7 +35,9 @@ bamf-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove usr/lib/*.so
- vmove usr/share/gtk-doc
+ if [ "$build_option_gtk_doc" ]; then
+ vmove usr/share/gtk-doc
+ fi
if [ "$build_option_gir" ]; then
vmove usr/share/gir-1.0
fi
From a78e6ff4ac257b0bca54e811c0bd6cf51f94884a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 14:01:54 +0100
Subject: [PATCH 2/4] libxslt-python: remove package
---
srcpkgs/libxslt-python | 1 -
srcpkgs/libxslt/template | 21 +++------------------
2 files changed, 3 insertions(+), 19 deletions(-)
delete mode 120000 srcpkgs/libxslt-python
diff --git a/srcpkgs/libxslt-python b/srcpkgs/libxslt-python
deleted file mode 120000
index fbcaa3cb7ad9..000000000000
--- a/srcpkgs/libxslt-python
+++ /dev/null
@@ -1 +0,0 @@
-libxslt
\ No newline at end of file
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index fd7fba7ba740..0a18a2e3fc61 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -4,15 +4,14 @@ version=1.1.34
revision=5
build_style=gnu-configure
configure_args="--disable-static --disable-dependency-tracking"
-hostmakedepends="docbook-xml docbook-xsl libtool python-devel
- libxml2-python pkg-config"
-makedepends="python-devel libxml2-devel libxml2-python libgcrypt-devel"
+hostmakedepends="docbook-xml docbook-xsl libtool pkg-config"
+makedepends="libxml2-devel libgcrypt-devel"
short_desc="XSLT parser library from the GNOME project"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xmlsoft.org/XSLT/"
distfiles="http://xmlsoft.org/sources/libxslt-${version}.tar.gz
- ftp://xmlsoft.org/${pkgname}/${pkgname}-${version}.tar.gz"
+ ftp://xmlsoft.org/${pkgname}/${pkgname}-${version}.tar.gz"
checksum="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
@@ -26,11 +25,6 @@ post_configure() {
# by Usage:
# Makefile is created after configure so fix here
find ${wrksrc} -type f -name Makefile | xargs sed -i '/Usage/,/--version/d'
- if [ "$CROSS_BUILD" ]; then
- sed -e "s|/usr/include/python2.7|$XBPS_CROSS_BASE/&|g" \
- -e "s|/usr/lib/python2.7/site-packages|$XBPS_CROSS_BASE/&|g" \
- -i python/Makefile
- fi
}
post_build() {
@@ -67,12 +61,3 @@ libxslt-devel_package() {
vmove usr/share/man/man3
}
}
-
-libxslt-python_package() {
- lib32disabled=yes
- short_desc+=" - python extension"
- pkg_install() {
- vmove "usr/lib/python*"
- vmove usr/share/doc/${sourcepkg}-python-${version}
- }
-}
From ee4bed08a21f2f289b609e8024d924cf244a0094 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 14:13:10 +0100
Subject: [PATCH 3/4] libxml2-python: remove package
* add python3 to dependencies of libxml2-python3
---
srcpkgs/libxml2-python/template | 34 -------------------
srcpkgs/libxml2-python3 | 1 -
.../patches/py39compat.patch | 0
.../patches/python3-utf8.patch | 0
srcpkgs/libxml2-python3/template | 26 ++++++++++++++
srcpkgs/libxml2/template | 2 +-
6 files changed, 27 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/libxml2-python/template
delete mode 120000 srcpkgs/libxml2-python3
rename srcpkgs/{libxml2-python => libxml2-python3}/patches/py39compat.patch (100%)
rename srcpkgs/{libxml2-python => libxml2-python3}/patches/python3-utf8.patch (100%)
create mode 100644 srcpkgs/libxml2-python3/template
diff --git a/srcpkgs/libxml2-python/template b/srcpkgs/libxml2-python/template
deleted file mode 100644
index 1d75b7ac56b3..000000000000
--- a/srcpkgs/libxml2-python/template
+++ /dev/null
@@ -1,34 +0,0 @@
-# Template file for 'libxml2-python'
-pkgname=libxml2-python
-version=2.9.10
-revision=4
-wrksrc="${pkgname%-python}-${version}"
-build_wrksrc=python
-build_style=python-module
-hostmakedepends="python-devel python3-devel"
-makedepends="libxml2-devel python-devel python3-devel"
-depends="python python3"
-short_desc="Library providing XML and HTML support - Python2 bindings"
-maintainer="Enno Boland <gottox@voidlinux.org>"
-license="MIT"
-homepage="http://www.xmlsoft.org/"
-distfiles="http://xmlsoft.org/sources/libxml2-${version}.tar.gz"
-checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
-
-post_patch() {
- if [ "${CROSS_BUILD}" ]; then
- vsed -i setup.py -e "s:/usr/include:${XBPS_CROSS_BASE}/usr/include:"
- fi
-}
-
-post_install() {
- vlicense ../COPYING
-}
-
-libxml2-python3_package() {
- short_desc="${short_desc/Python2/Python3}"
- pkg_install() {
- vmove "usr/lib/python3*"
- vlicense ../COPYING
- }
-}
diff --git a/srcpkgs/libxml2-python3 b/srcpkgs/libxml2-python3
deleted file mode 120000
index 7ba590df8660..000000000000
--- a/srcpkgs/libxml2-python3
+++ /dev/null
@@ -1 +0,0 @@
-libxml2-python
\ No newline at end of file
diff --git a/srcpkgs/libxml2-python/patches/py39compat.patch b/srcpkgs/libxml2-python3/patches/py39compat.patch
similarity index 100%
rename from srcpkgs/libxml2-python/patches/py39compat.patch
rename to srcpkgs/libxml2-python3/patches/py39compat.patch
diff --git a/srcpkgs/libxml2-python/patches/python3-utf8.patch b/srcpkgs/libxml2-python3/patches/python3-utf8.patch
similarity index 100%
rename from srcpkgs/libxml2-python/patches/python3-utf8.patch
rename to srcpkgs/libxml2-python3/patches/python3-utf8.patch
diff --git a/srcpkgs/libxml2-python3/template b/srcpkgs/libxml2-python3/template
new file mode 100644
index 000000000000..46dfd05a0bcf
--- /dev/null
+++ b/srcpkgs/libxml2-python3/template
@@ -0,0 +1,26 @@
+# Template file for 'libxml2-python3'
+pkgname=libxml2-python3
+version=2.9.10
+revision=5
+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="http://xmlsoft.org/sources/libxml2-${version}.tar.gz"
+checksum=aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
+
+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/template b/srcpkgs/libxml2/template
index 6a68fb6691c3..22d533816ab0 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -1,6 +1,6 @@
# Template file for 'libxml2'
#
-# Please keep this in sync with "srcpkgs/libxml2-python"
+# Please keep this in sync with "srcpkgs/libxml2-python3"
#
pkgname=libxml2
version=2.9.10
From 1bc68a03c1cc1aa07836c8e21fbeace19f369de2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 9 Jan 2022 14:26:07 +0100
Subject: [PATCH 4/4] removed-packages: remove unused dependencies
* libxslt-python
* libxml2-python
---
srcpkgs/removed-packages/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0b057f0241bd..c14aeb0167f7 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=57
+revision=58
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -213,7 +213,9 @@ replaces="
librpcsecgss<=0.19_6
libshiboken-python3<=5.15.0_3
libspa-ffmpeg<=0.3.32_1
+ libxml2-python<=2.9.10_4
libxnoise<=0.2.21_4
+ libxslt-python<=1.1.34_5
livewallpaper<=0.5.0_2
llvm3.9<=3.9.1_5
lprng<=3.8.C_1
^ permalink raw reply [flat|nested] 3+ messages in thread