[Pkg-xfce-commits] [Git][xfce-team/apps/parole][debian/master] 2 commits: d/patches: add patch to replace DATADIRNAME by datarootdir in configure.ac

[Yves-Alexis Perez (@corsac)]

Yves-Alexis Perez pushed to branch debian/master at xfce / apps / parole


Commits:
0d3907b8 by Yves-Alexis Perez at 2022-12-22T18:43:25+01:00
d/patches: add patch to replace DATADIRNAME by datarootdir in configure.ac

Fixes FTBFS with more recent toolchain.

Closes: #1026648

- - - - -
152a914a by Yves-Alexis Perez at 2022-12-22T18:44:31+01:00
update changelog

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0001-Replace-DATADIRNAME-by-datarootdir-in-configure.ac.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+parole (4.16.0-2) UNRELEASED; urgency=medium
+
+  [ Debian Janitor ]
+  * Apply multi-arch hints. + parole-dev: Add Multi-Arch: same.
+
+  [ Yves-Alexis Perez ]
+  * d/patches: add patch to replace DATADIRNAME by datarootdir in configure.ac
+    (Closes: #1026648)
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Thu, 22 Dec 2022 18:44:22 +0100
+
 parole (4.16.0-1) unstable; urgency=medium
 
   * New upstream version 4.16.0


=====================================
debian/patches/0001-Replace-DATADIRNAME-by-datarootdir-in-configure.ac.patch
=====================================
@@ -0,0 +1,29 @@
+From: Yves-Alexis Perez <corsac at debian.org>
+Date: Wed, 21 Dec 2022 16:28:15 +0100
+Subject: Replace DATADIRNAME by datarootdir in configure.ac
+
+DATADIRNAME seems gone from gettext.m4 so pixmapsdir ends up wrong
+---
+ configure.ac | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 94c5d0a..ed33e9a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,13 +146,8 @@ XDT_CHECK_LIBX11()
+ # ===================================================== #
+ #                    Pixmaps files                      #
+ # ===================================================== #
+-if test "x${prefix}" = "xNONE"; then
+-  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
+-  pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
+-else
+-  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps", [pixmaps directory])
+-  pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
+-fi
++AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${datarootdir}/${PACKAGE}/pixmaps", [pixmaps directory])
++pixmapsdir="${datarootdir}/${PACKAGE}/pixmaps"
+ 
+ AC_SUBST(pixmapsdir)
+ 


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+0001-Replace-DATADIRNAME-by-datarootdir-in-configure.ac.patch



View it on GitLab: https://salsa.debian.org/xfce-team/apps/parole/-/compare/83c6f808242c0d0ceb634ba11627cee65eadb2b9...152a914a2110a17bb9f9331121b505f6e9acbed8

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/apps/parole/-/compare/83c6f808242c0d0ceb634ba11627cee65eadb2b9...152a914a2110a17bb9f9331121b505f6e9acbed8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20221222/70370747/attachment-0001.htm>