Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / firewalld
Commits: 5f2f37e3 by Robin Candau at 2026-08-18T19:59:16+02:00 upgpkg: 2.5.1-2: Fix gettext domain Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/firewalld/-/work_items/13 - - - - - 4 changed files: - .SRCINFO - PKGBUILD - REUSE.toml - + fix_gettext_domain.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,6 +1,6 @@ pkgbase = firewalld pkgver = 2.5.1 - pkgrel = 1 + pkgrel = 2 url = https://firewalld.org arch = any license = GPL-2.0-or-later @@ -12,9 +12,11 @@ pkgbase = firewalld source = git+https://github.com/firewalld/firewalld.git#tag=v2.5.1 source = firewalld-sysconfigdir.patch source = fix_gettext_macros_path.patch + source = fix_gettext_domain.patch sha256sums = a4d2320c5da7561cf8311ab3f0c374f8746db7497d60990e63313dfb5f59b39d sha256sums = 3b2e00f67680c2e620804eb28620d7370b4096851bcb5f6fec22460a21941ad9 sha256sums = 49f793aeaf2e87c834c734b37dc926c9579cc2ec0782e5fe297ee286df6c7ef6 + sha256sums = ead062334024680698aa3065bf1122b874e5dc9db41b504dcdc3befabeac1e09 pkgname = firewalld pkgdesc = Firewall daemon with D-Bus interface ===================================== PKGBUILD ===================================== @@ -6,17 +6,19 @@ pkgbase=firewalld pkgname=('firewalld' 'python-firewall' 'firewall-config' 'firewall-applet' 'firewalld-test') pkgver=2.5.1 -pkgrel=1 +pkgrel=2 url="https://firewalld.org"; arch=('any') license=('GPL-2.0-or-later') makedepends=('docbook-xsl' 'git' 'intltool' 'python' 'iptables') source=("git+https://github.com/firewalld/firewalld.git#tag=v${pkgver}"; 'firewalld-sysconfigdir.patch' - 'fix_gettext_macros_path.patch') + 'fix_gettext_macros_path.patch' + 'fix_gettext_domain.patch') sha256sums=('a4d2320c5da7561cf8311ab3f0c374f8746db7497d60990e63313dfb5f59b39d' '3b2e00f67680c2e620804eb28620d7370b4096851bcb5f6fec22460a21941ad9' - '49f793aeaf2e87c834c734b37dc926c9579cc2ec0782e5fe297ee286df6c7ef6') + '49f793aeaf2e87c834c734b37dc926c9579cc2ec0782e5fe297ee286df6c7ef6' + 'ead062334024680698aa3065bf1122b874e5dc9db41b504dcdc3befabeac1e09') prepare() { cd "${pkgbase}" @@ -25,6 +27,8 @@ prepare() { patch -Np1 -i "${srcdir}/firewalld-sysconfigdir.patch" # Fix gettext's macros path patch -Np1 -i "${srcdir}/fix_gettext_macros_path.patch" + # Fix gettext domain + patch -Np1 -i "${srcdir}/fix_gettext_domain.patch" NOCONFIGURE=true ./autogen.sh } ===================================== REUSE.toml ===================================== @@ -19,6 +19,7 @@ path = [ "*.hook", "firewalld-sysconfigdir.patch", "fix_gettext_macros_path.patch", + "fix_gettext_domain.patch", ] SPDX-FileCopyrightText = "Arch Linux contributors" SPDX-License-Identifier = "0BSD" ===================================== fix_gettext_domain.patch ===================================== @@ -0,0 +1,13 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -137,8 +137,8 @@ AC_ARG_VAR([DEFAULT_LOG_TARGET], m4_flatten([ + + ############################################################# + +-AC_SUBST([GETTEXT_PACKAGE], [PACKAGE_NAME]) +-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],) ++GETTEXT_PACKAGE=firewalld ++AC_SUBST(GETTEXT_PACKAGE) + + IT_PROG_INTLTOOL([0.35.0], [no-xml]) + AM_PO_SUBDIRS View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/firewalld/-/commit/5f2f37e3018835d0183ca44bc4467b3a096edec7 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/firewalld/-/commit/5f2f37e3018835d0183ca44bc4467b3a096edec7 You're receiving this email because of your account on gitlab.archlinux.org. Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications | Help: https://gitlab.archlinux.org/help
