From 22b5c28d41600e462c70f0d7047f06cad398bf96 Mon Sep 17 00:00:00 2001 From: "Dr. Tobias Quathamer" Date: Tue, 3 Oct 2017 14:56:49 +0200 Subject: [PATCH] Remove patch hurd_file_name_support, applied upstream --- debian/patches/hurd_file_name_support | 59 --------------------------- debian/patches/series | 1 - 2 files changed, 60 deletions(-) delete mode 100644 debian/patches/hurd_file_name_support diff --git a/debian/patches/hurd_file_name_support b/debian/patches/hurd_file_name_support deleted file mode 100644 index 0f0cc74163..0000000000 --- a/debian/patches/hurd_file_name_support +++ /dev/null @@ -1,59 +0,0 @@ -Description: Hurd build without PATH_MAX; currently broken -Forwarded: http://lists.gnu.org/archive/html/bug-lilypond/2017-01/msg00023.html -Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=761036;filename=hurd_file_name_support;msg=5 -Bug-Debian: https://bugs.debian.org/761036 -Author: Don Armstrong -Author: Petter Reinholdtsen -Reviewed-by: Dr. Tobias Quathamer -Reviewed-by: Anthony Fok -Last-Update: 2017-01-27 ---- a/flower/file-name.cc -+++ b/flower/file-name.cc -@@ -77,9 +77,16 @@ - string - get_working_directory () - { -+#ifdef _GNU_SOURCE -+ char *cwd = get_current_dir_name(); -+ string scwd(cwd); -+ free(cwd); -+ return scwd; -+#else - char cwd[PATH_MAX]; - // getcwd returns NULL upon a failure, contents of cwd would be undefined! - return string (getcwd (cwd, PATH_MAX)); -+#endif - } - - /* Join components to full file_name. */ ---- a/flower/test-file-path.cc -+++ b/flower/test-file-path.cc -@@ -6,12 +6,26 @@ - #include "yaffut.hh" - #include "config.hh" - -+string -+get_working_directory () -+{ -+#ifdef _GNU_SOURCE -+ char *cwd = get_current_dir_name(); -+ string scwd(cwd); -+ free(cwd); -+ return scwd; -+#else -+ char cwd[PATH_MAX]; -+ // getcwd returns NULL upon a failure, contents of cwd would be undefined! -+ return string (getcwd (cwd, PATH_MAX)); -+#endif -+} -+ - TEST (File_path, Find) - { - char const *extensions[] = {"ly", "", 0}; - string file = "init"; -- char cwd[PATH_MAX]; -- if (!getcwd (cwd, PATH_MAX)) -+ if (get_working_directory().empty()) - { - cerr << "Could not get current work directory\n"; - exit (1); diff --git a/debian/patches/series b/debian/patches/series index 6c63751e84..f430bd2b85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ add_dircategories_to_documentation -hurd_file_name_support more_debug_output_during_build support_guile_2 use_cstring_and_ctype_includes -- 2.39.2