From c6fa94613f1f9bbf3fb536187bfeae78dab72417 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Nov 2022 03:15:02 +0100 Subject: [PATCH] espeakedit: migrate to wxGTK32 --- pkgs/applications/audio/espeak/edit.nix | 5 +-- .../audio/espeak/espeakedit-wxgtk30.patch | 32 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 2240a8561164..2c86a036ceb2 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }: +{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK32, sox }: stdenv.mkDerivation rec { pname = "espeakedit"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ portaudio wxGTK ]; + buildInputs = [ portaudio wxGTK32 ]; # TODO: # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { ./espeakedit-configurable-sox-path.patch ./espeakedit-configurable-path-espeak-data.patch ./espeakedit-gcc6.patch + ./espeakedit-wxgtk30.patch ]; postPatch = '' diff --git a/pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch b/pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch new file mode 100644 index 000000000000..04e578824986 --- /dev/null +++ b/pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch @@ -0,0 +1,32 @@ +diff -uNr a/src/espeakedit.cpp b/src/espeakedit.cpp +--- a/src/espeakedit.cpp ++++ b/src/espeakedit.cpp +@@ -123,7 +126,7 @@ bool MyApp::OnInit(void) + {//===================== + + int j; +-wxChar *p; ++const wxChar *p; + char param[120]; + + +diff -uNr a/src/spect.cpp b/src/spect.cpp +--- a/src/spect.cpp ++++ b/src/spect.cpp +@@ -1,6 +1,7 @@ + /*************************************************************************** + * Copyright (C) 2005 to 2007 by Jonathan Duddington * + * email: jonsd@users.sourceforge.net * ++ * Copyright (C) 2013 by Reece H. Dunn * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * +@@ -92,6 +93,8 @@ float SpectTilt(int value, int freq) + + + SpectFrame::SpectFrame(SpectFrame *copy) ++ : FONT_SMALL(8,wxSWISS,wxNORMAL,wxNORMAL) ++ , FONT_MEDIUM(9,wxSWISS,wxNORMAL,wxNORMAL) + {//===================================== + + int ix;