diff options
| author |   Dave Woodfall | 2022-02-07 12:53:58 +0100 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo | 2022-02-07 17:02:05 +0100 |
| commit | 7777a236b2c28f3a6ce1eda41581b4c19e13a73c (patch) | |
| tree | a012b0000d3928be2f77e472bf82ff55cb63613d | |
| parent | 17c18687c8e7f2955c34c039978819b3c5b6ed76 (diff) | |
| download | slackbuilds-7777a236b2c28f3a6ce1eda41581b4c19e13a73c.tar.gz | |
audio/audioconvert: Patched.
Signed-off-by: Dave Woodfall <dave@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | audio/audioconvert/audioconvert.SlackBuild | 8 | ||||
| -rw-r--r-- | audio/audioconvert/audiofilename-class.patch | 39 |
2 files changed, 45 insertions, 2 deletions
diff --git a/audio/audioconvert/audioconvert.SlackBuild b/audio/audioconvert/audioconvert.SlackBuild index d2272ddc34..939d097cce 100644 --- a/audio/audioconvert/audioconvert.SlackBuild +++ b/audio/audioconvert/audioconvert.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=audioconvert VERSION=${VERSION:-0.4.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,8 +77,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# fixes compose() and decompose() errors. +patch --verbose -p1<$CWD/audiofilename-class.patch + +# it uses CPP not CXX CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CPPFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/audioconvert/audiofilename-class.patch b/audio/audioconvert/audiofilename-class.patch new file mode 100644 index 0000000000..a404be486b --- /dev/null +++ b/audio/audioconvert/audiofilename-class.patch @@ -0,0 +1,39 @@ +diff -Naur a/src/AudioFilename.cpp b/src/AudioFilename.cpp +--- a/src/AudioFilename.cpp 2014-07-25 01:35:40.000000000 +0000 ++++ b/src/AudioFilename.cpp 2022-02-04 05:04:13.086368320 +0000 +@@ -240,7 +240,7 @@ + } + else { + input_decompose.assign(&input[i],input.extent(i)); +- input_decompose = decompose(input_decompose,DecomposeCompat); ++ input_decompose = FXString::decompose(input_decompose,DecomposeCompat); + for (j=0;j<input_decompose.length();j=input_decompose.inc(j)){ + len = codec->utf2mb(&c,1,&input_decompose[j],input_decompose.extent(j)); + if (len>0 && c!=0x1A) { +@@ -256,7 +256,7 @@ + static FXString convert_and_decompose(const FXString & input) { + register FXint i=0; + FXString result; +- FXString in = decompose(input,DecomposeCanonical); ++ FXString in = FXString::decompose(input,DecomposeCanonical); + for (i=0;i<in.length();i=in.inc(i)){ + if (Ascii::isAscii(in[i]) && Ascii::isPrint(in[i]) ) { + result+=in[i]; +@@ -273,7 +273,7 @@ + result = filter(input,forbidden,opts); + + /// Make sure it is properly composed. Should we do this? +- result = compose(result,DecomposeCompat); ++ result = FXString::compose(result,DecomposeCompat); + + /// convert to given codec. + if (dynamic_cast<FXUTF8Codec*>(codec)==NULL) +@@ -290,7 +290,7 @@ + result = filter(input,forbidden,opts); + + /// Make sure it is properly composed. Should we do this? +- result = compose(result,DecomposeCompat); ++ result = FXString::compose(result,DecomposeCompat); + + /// convert to given codec. + result = convert_and_decompose(result); |