* [gentoo-commits] repo/gentoo:master commit in: sys-boot/woeusb-ng/files/, sys-boot/woeusb-ng/
@ 2024-11-27 23:41 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-11-27 23:41 UTC (permalink / raw
To: gentoo-commits
commit: a1f25dcfe6740a4066137e1d9360ff23ac272e9f
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Sun Nov 24 06:52:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 23:38:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f25dcf
sys-boot/woeusb-ng: new package, add 0.2.12
Imported from ::guru. This is a newer project that replaces
sys-boot/woeusb.
Changes from ::guru:
- Fix setuptools warnings
- Fix hardcoded org.freedesktop.policykit.exec.path
- Add non optional RDEPEND
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-boot/woeusb-ng/Manifest | 1 +
.../files/woeusb-ng-0.2.12-fix-pkg-discovery.patch | 28 +++++++++
.../files/woeusb-ng-0.2.12-skip-postinstall.patch | 13 ++++
sys-boot/woeusb-ng/metadata.xml | 15 +++++
sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild | 69 ++++++++++++++++++++++
5 files changed, 126 insertions(+)
diff --git a/sys-boot/woeusb-ng/Manifest b/sys-boot/woeusb-ng/Manifest
new file mode 100644
index 000000000000..cc515198d1a7
--- /dev/null
+++ b/sys-boot/woeusb-ng/Manifest
@@ -0,0 +1 @@
+DIST woeusb-ng-0.2.12.tar.gz 219102 BLAKE2B d146697ce4143adc62b489a5dbd09bd2dd02d910a51357a27b1a92663eee279c6fa3bdd39b0f01e46f445cb0170c3b0dbf37ed7fdc442386247ff2acb85791e8 SHA512 3323d1f33f3c009652555ca20827d3ab902a59c21b4e57725ac7efb702c60c8ab8a572f77c7f5e4da91713ea5412811358870d6100e13e5828421645b7464c38
diff --git a/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-fix-pkg-discovery.patch b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-fix-pkg-discovery.patch
new file mode 100644
index 000000000000..33d84aa3179b
--- /dev/null
+++ b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-fix-pkg-discovery.patch
@@ -0,0 +1,28 @@
+Fix setuptools package discovery issues by using custom discovery.
+
+```
+/usr/lib/python3.12/site-packages/setuptools/command/build_py.py:212: _Warning: Package 'WoeUSB.data' is absent from the `packages` configuration.
+ ```
+
+There's an open PR to improve the packaging methods.
+https://github.com/WoeUSB/WoeUSB-ng/pull/79
+--- a/setup.py
++++ b/setup.py
+@@ -2,7 +2,7 @@ import os
+ import shutil
+ import stat
+
+-from setuptools import setup
++from setuptools import setup, find_namespace_packages
+ from setuptools.command.develop import develop
+ from setuptools.command.install import install
+
+@@ -57,7 +57,7 @@ setup(
+ author_email='jakubmateusz@poczta.onet.pl',
+ license='GPL-3',
+ zip_safe=False,
+- packages=['WoeUSB'],
++ packages=find_namespace_packages(exclude=['doc', 'miscellaneous']),
+ include_package_data=True,
+ scripts=[
+ 'WoeUSB/woeusb',
diff --git a/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-skip-postinstall.patch b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-skip-postinstall.patch
new file mode 100644
index 000000000000..3f632d3db67c
--- /dev/null
+++ b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-skip-postinstall.patch
@@ -0,0 +1,13 @@
+Prevent installing files to hardcoded locations.
+
+There's an open PR to improve the packaging methods.
+https://github.com/WoeUSB/WoeUSB-ng/pull/79
+--- a/setup.py
++++ b/setup.py
+@@ -68,6 +68,5 @@ setup(
+ ],
+ cmdclass={
+ 'develop': PostDevelopCommand,
+- 'install': PostInstallCommand
+ }
+ )
diff --git a/sys-boot/woeusb-ng/metadata.xml b/sys-boot/woeusb-ng/metadata.xml
new file mode 100644
index 000000000000..bbe0695f9f03
--- /dev/null
+++ b/sys-boot/woeusb-ng/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>pastalian46@gmail.com</email>
+ <name>Takuya Wakazono</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">WoeUSB/WoeUSB-ng</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild b/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild
new file mode 100644
index 000000000000..6b4066c6c6a9
--- /dev/null
+++ b/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit desktop distutils-r1 optfeature xdg
+
+MY_PN="WoeUSB-ng"
+DESCRIPTION="Create a Windows USB stick installer from an iso image (rewrite of WoeUSB)"
+HOMEPAGE="https://github.com/WoeUSB/WoeUSB-ng"
+SRC_URI="https://github.com/WoeUSB/WoeUSB-ng/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+RDEPEND="
+ !sys-boot/woeusb
+ app-arch/p7zip
+ sys-apps/util-linux
+ sys-block/parted
+ sys-boot/grub:2
+ sys-fs/dosfstools
+ sys-fs/ntfs3g[ntfsprogs]
+ $(python_gen_cond_dep '
+ dev-python/termcolor[${PYTHON_USEDEP}]
+ gui? ( dev-python/wxpython:4.0[${PYTHON_USEDEP}] )
+ ')
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-pkg-discovery.patch
+ "${FILESDIR}"/${P}-skip-postinstall.patch
+)
+
+src_prepare() {
+ distutils-r1_src_prepare
+ python_fix_shebang WoeUSB
+
+ # fix hardcoded org.freedesktop.policykit.exec.path
+ sed -i "s|/usr/local/bin|${EPREFIX}/usr/bin|" \
+ miscellaneous/com.github.woeusb.woeusb-ng.policy \
+ WoeUSB/utils.py || die
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ if use gui; then
+ dobin WoeUSB/woeusbgui
+
+ insinto /usr/share/polkit-1/actions
+ doins miscellaneous/com.github.woeusb.woeusb-ng.policy
+
+ doicon -s 256 WoeUSB/data/woeusb-logo.png
+ make_desktop_entry woeusbgui WoeUSB-ng woeusb-logo Utility
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ optfeature "Legacy PC bootmode support" "sys-boot/grub:2[grub_platforms_pc]"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-boot/woeusb-ng/files/, sys-boot/woeusb-ng/
@ 2025-03-21 14:02 Viorel Munteanu
0 siblings, 0 replies; 2+ messages in thread
From: Viorel Munteanu @ 2025-03-21 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 9ba869dfdf7f44abbbc3f77e4f7b86b1e3aa465e
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Fri Mar 21 12:31:27 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 14:02:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba869df
sys-boot/woeusb-ng: fix syntax warning in Python 3.12
https://github.com/WoeUSB/WoeUSB-ng/pull/134
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/41211
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch | 16 ++++++++++++++++
sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git a/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch
new file mode 100644
index 000000000000..dfda16cdb417
--- /dev/null
+++ b/sys-boot/woeusb-ng/files/woeusb-ng-0.2.12-python3.12.patch
@@ -0,0 +1,16 @@
+https://github.com/WoeUSB/WoeUSB-ng/pull/134
+Fix invalid escape sequence
+\. is not a valid escape sequence since Python 3.12 and generates a warning.
+It will become an error in a future version.
+https://docs.python.org/3.12/whatsnew/3.12.html#other-language-changes
+--- a/WoeUSB/workaround.py
++++ b/WoeUSB/workaround.py
+@@ -52,7 +52,7 @@ def support_windows_7_uefi_boot(source_fs_mountpoint, target_fs_mountpoint):
+ :param target_fs_mountpoint:
+ :return:
+ """
+- grep = subprocess.run(["grep", "--extended-regexp", "--quiet", "^MinServer=7[0-9]{3}\.[0-9]",
++ grep = subprocess.run(["grep", "--extended-regexp", "--quiet", r"^MinServer=7[0-9]{3}\.[0-9]",
+ source_fs_mountpoint + "/sources/cversion.ini"],
+ stdout=subprocess.PIPE).stdout.decode("utf-8").strip()
+ if grep == "" and not os.path.isfile(source_fs_mountpoint + "/bootmgr.efi"):
diff --git a/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild b/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild
index 8e3fe806b529..c69498f1ff1a 100644
--- a/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild
+++ b/sys-boot/woeusb-ng/woeusb-ng-0.2.12.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-fix-pkg-discovery.patch
+ "${FILESDIR}"/${P}-python3.12.patch
"${FILESDIR}"/${P}-skip-postinstall.patch
)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-21 14:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-21 14:02 [gentoo-commits] repo/gentoo:master commit in: sys-boot/woeusb-ng/files/, sys-boot/woeusb-ng/ Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2024-11-27 23:41 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox