alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch

16 lines
589 B
Diff
Raw Normal View History

flatpak: 1.2.4 -> 1.4.2 * Regenerated all patches for 1.4.2 and resolved any conflicts. * fix-test-paths.patch doesn't copy the whole locale archive because we have C.UTF8 now. * nixos/flatpak creates a Flatpak system helper user Change introduced in 1.3.2. Changes: See https://github.com/flatpak/flatpak/releases/tag/1.3.1 through 1.4.2.
2019-07-22 20:35:46 +01:00
diff --git a/acinclude.m4 b/acinclude.m4
index 92ec3985..b3fccf1d 100644
flatpak: init at 0.11.7
2017-10-02 14:40:26 +01:00
--- a/acinclude.m4
+++ b/acinclude.m4
flatpak: 1.2.4 -> 1.4.2 * Regenerated all patches for 1.4.2 and resolved any conflicts. * fix-test-paths.patch doesn't copy the whole locale archive because we have C.UTF8 now. * nixos/flatpak creates a Flatpak system helper user Change introduced in 1.3.2. Changes: See https://github.com/flatpak/flatpak/releases/tag/1.3.1 through 1.4.2.
2019-07-22 20:35:46 +01:00
@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG],
flatpak: init at 0.11.7
2017-10-02 14:40:26 +01:00
[
AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
- if $jh_found_xmlcatalog && \
- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
+ # empty argument forces libxml to use XML_CATALOG_FILES variable
+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
AC_MSG_RESULT([found])
ifelse([$3],,,[$3
])dnl
Copy permalink