diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-16 22:49:20 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-16 22:49:20 +0200 |
| commit | 2e56ba6fbdd70ed6b9244df816670b9a94da0824 (patch) | |
| tree | d166c8c37aae3e2856378b4526cfddb66291466d /pkgs/applications/misc/redshift/575.patch | |
| parent | 782b63d06ba886d7093af764c2e3441a5e96ffc2 (diff) | |
| parent | cf8643cc8e61b0482c87faf33e6310c4e15bcba1 (diff) | |
| download | nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.gz nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.bz2 nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.lz nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.xz nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.tar.zst nixlib-2e56ba6fbdd70ed6b9244df816670b9a94da0824.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/applications/misc/redshift/575.patch')
| -rw-r--r-- | pkgs/applications/misc/redshift/575.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/pkgs/applications/misc/redshift/575.patch b/pkgs/applications/misc/redshift/575.patch new file mode 100644 index 000000000000..d731d8ec43ad --- /dev/null +++ b/pkgs/applications/misc/redshift/575.patch @@ -0,0 +1,51 @@ +From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001 +From: Yegor Timoshenko <yegortimoshenko@riseup.net> +Date: Tue, 16 Jan 2018 11:43:46 +0000 +Subject: [PATCH] Fix Autoconf script + +gettext/intltool macros are not used correctly, see: +https://bugs.launchpad.net/inkscape/+bug/1418943 +--- + bootstrap | 6 +----- + configure.ac | 5 +---- + 2 files changed, 2 insertions(+), 9 deletions(-) + +diff --git a/bootstrap b/bootstrap +index 0599cf5..40b1dca 100755 +--- a/bootstrap ++++ b/bootstrap +@@ -1,7 +1,3 @@ + #!/bin/sh + +-# change to root directory +-cd $(dirname "$0") +- +-autopoint --force && \ +- AUTOPOINT="intltoolize --automake --copy" autoreconf --force --install --verbose ++autoreconf --force --install && intltoolize +diff --git a/configure.ac b/configure.ac +index be0b51a..a2e7c42 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,6 +17,7 @@ AC_PROG_OBJC # For macOS support modules + AC_LANG([C]) + + AC_PROG_INTLTOOL([0.50]) ++AC_SUBST(LIBINTL) + + AC_CANONICAL_HOST + +@@ -51,10 +52,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ + ]) + AC_LANG_POP([Objective C]) + +-# Checks for libraries. +-AM_GNU_GETTEXT_VERSION([0.17]) +-AM_GNU_GETTEXT([external]) +- + GETTEXT_PACKAGE=redshift + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext]) +-- +2.15.1 + |