Date: Fri, 7 Jul 2017 13:37:34 -0700 From: "Jack L." <xxjack12xx@gmail.com> To: Mike Clarke <jmc-freebsd2@milibyte.co.uk> Cc: "freebsd-questions@freebsd.org" <freebsd-questions@freebsd.org> Subject: Re: How to fix wx error ? Message-ID: <CALeGphx4wdXCH-6Bc67tVpMAZnP1grLMGscCohNsTcwz%2B6ak-g@mail.gmail.com> In-Reply-To: <20170707120936.620323e3@curlew> References: <VI1PR02MB1200F5F65747DBEA86A896DEF6D40@VI1PR02MB1200.eurprd02.prod.outlook.com> <CALeGphxi05MqBK5wnEaQtxVJN%2BqUEWD5vfE1OJuuaMhh%2Bk6e5g@mail.gmail.com> <VI1PR02MB1200913A24FC7C312FB08BD9F6D50@VI1PR02MB1200.eurprd02.prod.outlook.com> <CALeGphw2SnHkTUO%2BcOL5Crbky5B5VAkfTBTBsQ9skgUXQkt2%2Bw@mail.gmail.com> <20170707120936.620323e3@curlew>
next in thread | previous in thread | raw e-mail | index | archive | help
do a clean checkout of /usr/ports/audio/audacity then patch -EB '' -p1 < thepatch On Fri, Jul 7, 2017 at 4:09 AM, Mike Clarke <jmc-freebsd2@milibyte.co.uk> wrote: > On Thu, 6 Jul 2017 22:05:32 -0700 > "Jack L." <xxjack12xx@gmail.com> wrote: > >> Looks like you applied the wrong patch >> >> https://bz-attachments.freebsd.org/attachment.cgi?id=183724 >> >> is the one that should fix the issue. > > I'm struggling with this one too. applying the patch results in many of > the patch-* files being replaced with empty files. Make then fails > with: > > ===> Applying FreeBSD patches for audacity-2.1.3 > I can't seem to find a patch in there anywhere. > => FreeBSD patch patch-Makefile.am failed to apply cleanly. > *** Error code 1 > > What am I doing wrong? > > Here's the full log of what I did: > > --------------------------------------------------------------------------------------------------- > > Script started on Fri Jul 7 11:37:10 2017 > > curlew:/tmp/fixit# cp -r /usr/ports/audio/audacity . > > curlew:/tmp/fixit# fetch -o patchit "https://bz-attachments.freebsd.org/attachme nt.cgi?id=183724" > > fetch: https://bz-attachments.freebsd.org/attachment.cgi?id=183724: size of remote file is not known > > patchit 0 B 0 Bps > patchit 14 kB 42 kBps > patchit 14 kB 42 kBps 00m01s > curlew:/tmp/fixit# patch < patchit > > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/Makefile audacity-new/Makefile > |--- audacity/Makefile 2017-06-22 16:44:06.694560000 -0700 > |+++ audacity-new/Makefile 2017-06-22 18:19:03.372580000 -0700 > -------------------------- > Patching file audacity/Makefile using Plan A... > Hunk #1 succeeded at 22. > Hunk #2 succeeded at 36. > Hunk #3 succeeded at 49. > Hunk #4 succeeded at 59. > Hunk #5 succeeded at 118. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-Makefile.am audacity-new/files/patch-Makefile.am > |--- audacity/files/patch-Makefile.am 2017-06-22 16:09:36.654125000 -0700 > |+++ audacity-new/files/patch-Makefile.am 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-Makefile.am using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-configure.ac audacity-new/files/patch-configure.ac > |--- audacity/files/patch-configure.ac 2017-06-22 16:09:36.505415000 -0700 > |+++ audacity-new/files/patch-configure.ac 2017-06-21 19:34:42.080951000 -0700 > -------------------------- > Patching file audacity/files/patch-configure.ac using Plan A... > Hunk #1 succeeded at 1. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-include_Makefile.am audacity-new/files/patch-include_Makefile.am > |--- audacity/files/patch-include_Makefile.am 2017-06-22 16:09:36.669535000 -0700 > |+++ audacity-new/files/patch-include_Makefile.am 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-include_Makefile.am using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-include_audacity_Types.h audacity-new/files/patch-include_audacity_Types.h > |--- audacity/files/patch-include_audacity_Types.h 1969-12-31 16:00:00.000000000 -0800 > |+++ audacity-new/files/patch-include_audacity_Types.h 2017-06-19 15:56:30.856183000 -0700 > -------------------------- > (Creating file patch-include_audacity_Types.h...) > Patching file patch-include_audacity_Types.h using Plan A... > Empty context always matches. > Hunk #1 succeeded at 1. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-lib-src_libnyquist_Makefile.am audacity-new/files/patch-lib-src_libnyquist_Makefile.am > |--- audacity/files/patch-lib-src_libnyquist_Makefile.am 2017-06-22 16:09:36.613912000 -0700 > |+++ audacity-new/files/patch-lib-src_libnyquist_Makefile.am 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-lib-src_libnyquist_Makefile.am using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-lib-src_libnyquist_configure.ac audacity-new/files/patch-lib-src_libnyquist_configure.ac > |--- audacity/files/patch-lib-src_libnyquist_configure.ac 2017-06-22 16:09:36.288186000 -0700 > |+++ audacity-new/files/patch-lib-src_libnyquist_configure.ac 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-lib-src_libnyquist_configure.ac using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac audacity-new/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac > |--- audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac 2017-06-22 16:09:36.248092000 -0700 > |+++ audacity-new/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-lib-src_portaudio-v19_bindings_cpp_configure.ac using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-lib-src_portmixer_include_portmixer.h audacity-new/files/patch-lib-src_portmixer_include_portmixer.h > |--- audacity/files/patch-lib-src_portmixer_include_portmixer.h 2017-06-22 16:09:36.570537000 -0700 > |+++ audacity-new/files/patch-lib-src_portmixer_include_portmixer.h 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-lib-src_portmixer_include_portmixer.h using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am audacity-new/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am > |--- audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am 2017-06-22 16:09:36.020905000 -0700 > |+++ audacity-new/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-lib-src_soundtouch_source_SoundTouch_Makefile.am using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-m4_audacity__checklib__libsndfile.m4 audacity-new/files/patch-m4_audacity__checklib__libsndfile.m4 > |--- audacity/files/patch-m4_audacity__checklib__libsndfile.m4 2017-06-22 16:09:36.194363000 -0700 > |+++ audacity-new/files/patch-m4_audacity__checklib__libsndfile.m4 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-m4_audacity__checklib__libsndfile.m4 using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-src_Audacity.h audacity-new/files/patch-src_Audacity.h > |--- audacity/files/patch-src_Audacity.h 1969-12-31 16:00:00.000000000 -0800 > |+++ audacity-new/files/patch-src_Audacity.h 2017-06-19 15:56:30.856329000 -0700 > -------------------------- > (Creating file patch-src_Audacity.h...) > Patching file patch-src_Audacity.h using Plan A... > Empty context always matches. > Hunk #1 succeeded at 1. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-src_AudioIO.h audacity-new/files/patch-src_AudioIO.h > |--- audacity/files/patch-src_AudioIO.h 2017-06-22 16:09:35.915493000 -0700 > |+++ audacity-new/files/patch-src_AudioIO.h 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-src_AudioIO.h using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-src_DeviceManager.cpp audacity-new/files/patch-src_DeviceManager.cpp > |--- audacity/files/patch-src_DeviceManager.cpp 2017-06-22 16:09:36.809250000 -0700 > |+++ audacity-new/files/patch-src_DeviceManager.cpp 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-src_DeviceManager.cpp using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/files/patch-src_prefs_DevicePrefs.cpp audacity-new/files/patch-src_prefs_DevicePrefs.cpp > |--- audacity/files/patch-src_prefs_DevicePrefs.cpp 2017-06-22 16:09:35.933438000 -0700 > |+++ audacity-new/files/patch-src_prefs_DevicePrefs.cpp 1969-12-31 16:00:00.000000000 -0800 > -------------------------- > Patching file audacity/files/patch-src_prefs_DevicePrefs.cpp using Plan A... > Hunk #1 succeeded at 0. > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |diff -urN audacity/pkg-plist audacity-new/pkg-plist > |--- audacity/pkg-plist 2017-06-22 16:09:36.920198000 -0700 > |+++ audacity-new/pkg-plist 2017-06-21 20:04:10.340325000 -0700 > -------------------------- > Patching file audacity/pkg-plist using Plan A... > Hunk #1 succeeded at 1. > Hunk #2 succeeded at 80. > done > curlew:/tmp/fixit# ls -l audacity/files > > total 132 > -rw-r--r-- 1 root wheel 816 7 Jul 11:44 patch-configure.ac > -rw-r--r-- 1 root wheel 500 7 Jul 11:38 patch-configure.ac.orig > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-include_Makefile.am > -rw-r--r-- 1 root wheel 655 7 Jul 11:38 patch-include_Makefile.am.orig > -rw-r--r-- 1 root wheel 335 7 Jul 11:38 patch-lib-src_FileDialog_configure.ac > -rw-r--r-- 1 root wheel 426 7 Jul 11:38 patch-lib-src_FileDialog_gtk_Makefile.am > -rw-r--r-- 1 root wheel 391 7 Jul 11:38 patch-lib-src_FileDialog_mac_Makefile.am > -rw-r--r-- 1 root wheel 1347 7 Jul 11:38 patch-lib-src_FileDialog_Makefile.am > -rw-r--r-- 1 root wheel 392 7 Jul 11:38 patch-lib-src_FileDialog_win_Makefile.am > -rw-r--r-- 1 root wheel 1582 7 Jul 11:38 patch-lib-src_libmad_configure.ac > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-lib-src_libnyquist_configure.ac > -rw-r--r-- 1 root wheel 264 7 Jul 11:38 patch-lib-src_libnyquist_configure.ac.orig > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-lib-src_libnyquist_Makefile.am > -rw-r--r-- 1 root wheel 436 7 Jul 11:38 patch-lib-src_libnyquist_Makefile.am.orig > -rw-r--r-- 1 root wheel 290 7 Jul 11:38 patch-lib-src_libnyquist_nyquist_cmt_cext.h > -rw-r--r-- 1 root wheel 245 7 Jul 11:38 patch-lib-src_libnyquist_nyquist_nyqstk_include_FileRead.h > -rw-r--r-- 1 root wheel 383 7 Jul 11:38 patch-lib-src_libnyquist_nyquist_xlisp_xlisp.h > -rw-r--r-- 1 root wheel 303 7 Jul 11:38 patch-lib-src_lv2_configure > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-lib-src_portaudio-v19_bindings_cpp_configure.ac > -rw-r--r-- 1 root wheel 381 7 Jul 11:38 patch-lib-src_portaudio-v19_bindings_cpp_configure.ac.orig > -rw-r--r-- 1 root wheel 1172 7 Jul 11:38 patch-lib-src_portmixer_configure.ac > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-lib-src_portmixer_include_portmixer.h > -rw-r--r-- 1 root wheel 256 7 Jul 11:38 patch-lib-src_portmixer_include_portmixer.h.orig > -rw-r--r-- 1 root wheel 260 7 Jul 11:38 patch-lib-src_portmixer_src_px__linux__alsa.c > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-lib-src_soundtouch_source_SoundTouch_Makefile.am > -rw-r--r-- 1 root wheel 418 7 Jul 11:38 patch-lib-src_soundtouch_source_SoundTouch_Makefile.am.orig > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-m4_audacity__checklib__libsndfile.m4 > -rw-r--r-- 1 root wheel 388 7 Jul 11:38 patch-m4_audacity__checklib__libsndfile.m4.orig > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-Makefile.am > -rw-r--r-- 1 root wheel 752 7 Jul 11:38 patch-Makefile.am.orig > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-src_AudioIO.h > -rw-r--r-- 1 root wheel 280 7 Jul 11:38 patch-src_AudioIO.h.orig > -rw-r--r-- 1 root wheel 541 7 Jul 11:38 patch-src_BatchCommands.cpp > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-src_DeviceManager.cpp > -rw-r--r-- 1 root wheel 305 7 Jul 11:38 patch-src_DeviceManager.cpp.orig > -rw-r--r-- 1 root wheel 857 7 Jul 11:38 patch-src_FFmpeg.h > -rw-r--r-- 1 root wheel 420 7 Jul 11:38 patch-src_Makefile.am > -rw-r--r-- 1 root wheel 0 7 Jul 11:44 patch-src_prefs_DevicePrefs.cpp > -rw-r--r-- 1 root wheel 305 7 Jul 11:38 patch-src_prefs_DevicePrefs.cpp.orig > curlew:/tmp/fixit# cd audacity > > curlew:/tmp/fixit/audacity# make > > ===> License GPLv2+ accepted by the user > ===> audacity-2.1.3 depends on file: /usr/local/sbin/pkg - found > ===> Fetching all distfiles required by audacity-2.1.3 for building > ===> Extracting for audacity-2.1.3 > => SHA256 Checksum OK for audacity-audacity-Audacity-2.1.3_GH0.tar.gz. > ===> Patching for audacity-2.1.3 > ===> Converting DOS text files to UNIX text files > ===> Applying FreeBSD patches for audacity-2.1.3 > I can't seem to find a patch in there anywhere. > => FreeBSD patch patch-Makefile.am failed to apply cleanly. > *** Error code 1 > > Stop. > make[1]: stopped in /tmp/fixit/audacity > *** Error code 1 > > Stop. > make: stopped in /tmp/fixit/audacity > curlew:/tmp/fixit/audacity# ^D exit > > Script done on Fri Jul 7 11:46:26 2017 > > -- > Mike Clarke > _______________________________________________ > freebsd-questions@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to "freebsd-questions-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CALeGphx4wdXCH-6Bc67tVpMAZnP1grLMGscCohNsTcwz%2B6ak-g>