mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-05 05:13:04 +00:00
Merge pull request #199443 from wegank/espeakedit-wxgtk
espeakedit: migrate to wxGTK32
This commit is contained in:
commit
94d6273797
@ -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 = ''
|
||||
|
32
pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch
Normal file
32
pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch
Normal file
@ -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;
|
Loading…
Reference in New Issue
Block a user