rpm/rosegarden
SHA256
1
0
Fork 0
forked from pool/rosegarden
Code Pull Requests Activity

Accepting request 263393 from home:Ledest:bashisms

Browse Source 
fix bashisms in scripts

OBS-URL: https://build.opensuse.org/request/show/263393
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/rosegarden?expand=0&rev=60
This commit is contained in:
Dave Plater 2014-12-25 07:13:23 +00:00 committed by Git OBS Bridge
parent 0904069f9a
commit 6921f2e840
3 changed files with 95 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
rosegarden-14.02-fix-bashisms.patch Normal file
View File

@ -0,0 +1,86 @@
diff -Ndur rosegarden-14.02/scripts/distclean.sh rosegarden-14.02-fix-bashisms/scripts/distclean.sh
--- rosegarden-14.02/scripts/distclean.sh 2014-03-03 13:58:44.000000000 +0200
+++ rosegarden-14.02-fix-bashisms/scripts/distclean.sh 2014-11-29 04:16:27.094140542 +0200
@@ -1,12 +1,10 @@
#!/bin/sh
-rm -f {,src/,po/,docs/,data/}CMakeCache.txt
-rm -f {,src/,po/,docs/,data/}cmake_install.cmake
-rm -f {,src/,po/,docs/,data/}cmake_uninstall.cmake
-rm -f {,src/,po/,docs/,data/}CPackConfig.cmake
-rm -f {,src/,po/,docs/,data/}CPackSourceConfig.cmake
-rm -f {,src/,po/,docs/,data/}install_manifest.txt
-rm -f {,src/,po/,docs/,data/}progress.make
-rm -f {,src/,po/,docs/,data/}Makefile
-rm -rf {,src/,po/,docs/,data/}CMakeFiles
-rm -rf {,src/,po/,docs/,data/}_CPack_Packages
+for d in . src po docs data; do
+ for f in CMakeCache.txt cmake_install.cmake cmake_uninstall.cmake CPackConfig.cmake CPackSourceConfig.cmake install_manifest.txt progress.make Makefile; do
+ rm -f $d/$f
+ done
+ for f in CMakeFiles _CPack_Packages; do
+ rm -rf $d/$f
+ done
+done
rm -rf RGbuild/*
diff -Ndur rosegarden-14.02/scripts/reorganise.sh rosegarden-14.02-fix-bashisms/scripts/reorganise.sh
--- rosegarden-14.02/scripts/reorganise.sh 2014-03-03 13:58:44.000000000 +0200
+++ rosegarden-14.02-fix-bashisms/scripts/reorganise.sh 2014-11-29 04:21:14.766121081 +0200
@@ -585,7 +585,7 @@
fi
fi
done
-mv guitar/*.{cpp,h} $g/editors/guitar/
+mv guitar/*.cpp guitar/*.h $g/editors/guitar/
cd ../src
@@ -601,21 +601,25 @@
perlcommand="s/$before/$after/g ; $perlcommand"
done
-for file in */*.{cpp,h} */*/*.{cpp,h} */*/*/*.{cpp,h}; do
- perl -i -p -e "$perlcommand" $file
+for e in cpp h; do
+ for file in */*.$e */*/*.$e */*/*/*.$e; do
+ perl -i -p -e "$perlcommand" $file
+ done
done
echo Adding headers at `date`... 1>&2
-for x in {base,sound,sequencer}/*.h ; do
- egrep "^class [A-Za-z_0-9][^:;]*" $x | \
- grep -v ';' | \
- sed -e 's/^class //' -e 's/[:;{</].*//' | \
- sort | uniq | \
- sed "s, *\$,:$x,"
- egrep '^typedef ([A-Za-z0-9_]+ +)+[A-Za-z][A-Za-z0-9_]* *; *$' $x | \
- sed 's/^.* \([A-Za-z0-9_]*\) *; *$/\1/' | \
- sed "s, *\$,:$x,"
+for d in base sound sequencer; do
+ for x in $d/*.h ; do
+ egrep "^class [A-Za-z_0-9][^:;]*" $x | \
+ grep -v ';' | \
+ sed -e 's/^class //' -e 's/[:;{</].*//' | \
+ sort | uniq | \
+ sed "s, *\$,:$x,"
+ egrep '^typedef ([A-Za-z0-9_]+ +)+[A-Za-z][A-Za-z0-9_]* *; *$' $x | \
+ sed 's/^.* \([A-Za-z0-9_]*\) *; *$/\1/' | \
+ sed "s, *\$,:$x,"
+ done
done > $class_header_cache
for hfile in $candidate_h ; do
@@ -788,8 +792,10 @@
echo Formatting at `date`... 1>&2
-for file in */*.{cpp,h} */*/*.{cpp,h} */*/*/*.{cpp,h} ; do
- perl -i -p -e 's,^//(inc|dec|ndec|replacement_candidate)!,,' $file
+for e in cpp h; do
+ for file in */*.$e */*/*.$e */*/*/*.$e ; do
+ perl -i -p -e 's,^//(inc|dec|ndec|replacement_candidate)!,,' $file
+ done
done
for file in */*.cpp */*/*.cpp */*/*/*.cpp ; do

7
rosegarden.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Nov 29 02:23:00 UTC 2014 - Led <ledest@gmail.com>
- fix bashisms in scripts
- add patches:
* rosegarden-14.02-fix-bashisms.patch
-------------------------------------------------------------------
Fri Sep 19 12:28:37 UTC 2014 - davejplater@gmail.com

2
rosegarden.spec
View File

@ -28,6 +28,7 @@ Source1: %{name}.xpm
Source2: %{name}.1
# This patch fixes the file search paths for examples, templates and midi driver libraries.
Patch1: rosegarden-10.10-filepaths.patch
Patch2: rosegarden-14.02-fix-bashisms.patch
BuildRequires: alsa-devel
BuildRequires: automake
BuildRequires: dssi-devel
@ -78,6 +79,7 @@ See the changelog for details.
%prep
%setup -q
%patch1
%patch2 -p1
# When we build svn we need to execute bootstrap.sh it doesn't harm the release build either.
sh bootstrap.sh