From 9e22cce74a47628b54906c00b6c7704aca09c7cf Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 27 Dec 2010 11:52:14 +0100 Subject: [PATCH] Only ignore 0*patch in / and add missing patches. --- .gitignore | 2 +- ...cwd-to-PATH.-Fixes-invoking-as-lilyp.patch | 39 +++++++++ ...ages-and-toolbar.-Move-patching-out-.patch | 81 +++++++++++++++++++ ...sion-in-output-to-2.7.38-oldest-supp.patch | 27 +++++++ 4 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 patches/0001-MINGW32-Prepend-cwd-to-PATH.-Fixes-invoking-as-lilyp.patch create mode 100644 patches/0001-Revert-Enable-images-and-toolbar.-Move-patching-out-.patch create mode 100644 patches/0001-midi2ly-bump-version-in-output-to-2.7.38-oldest-supp.patch diff --git a/.gitignore b/.gitignore index f87fe0d96..1bf50e7c5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ *pats *~ .\#* -0[0-9][0-9][0-9]-*.patch +/0[0-9][0-9][0-9]-*.patch TAGS \#* downloads diff --git a/patches/0001-MINGW32-Prepend-cwd-to-PATH.-Fixes-invoking-as-lilyp.patch b/patches/0001-MINGW32-Prepend-cwd-to-PATH.-Fixes-invoking-as-lilyp.patch new file mode 100644 index 000000000..086bb45a1 --- /dev/null +++ b/patches/0001-MINGW32-Prepend-cwd-to-PATH.-Fixes-invoking-as-lilyp.patch @@ -0,0 +1,39 @@ +From 1ba780c6f36cbd4b0adf7a21d7acbb2c6075817a Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Fri, 10 Dec 2010 13:06:59 +0100 +Subject: [PATCH] [MINGW32]: Prepend cwd to PATH. Fixes invoking as "lilypond.exe". + +--- + lily/relocate.cc | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/lily/relocate.cc b/lily/relocate.cc +index 698f06a..178e7d9 100644 +--- a/lily/relocate.cc ++++ b/lily/relocate.cc +@@ -201,17 +201,18 @@ setup_paths (char const *argv0_ptr) + File_path path; + path.parse_path (getenv ("PATH")); + +- if (be_verbose_global) +- warning (_f ("Relocation: from PATH=%s\nargv0=%s", +- path.to_string ().c_str (), argv0_ptr)); +- + #ifndef __MINGW32__ + argv0_abs = path.find (argv0_filename.to_string ()); + #else /* __MINGW32__ */ ++ path.prepend (get_working_directory ()); + char const *ext[] = {"exe", "", 0 }; + argv0_abs = path.find (argv0_filename.to_string (), ext); + #endif /* __MINGW32__ */ + ++ if (be_verbose_global) ++ warning (_f ("Relocation: from PATH=%s\nargv0=%s", ++ path.to_string ().c_str (), argv0_ptr)); ++ + if (argv0_abs.empty ()) + programming_error ("cannot find absolute argv0"); + } +-- +1.7.1 + diff --git a/patches/0001-Revert-Enable-images-and-toolbar.-Move-patching-out-.patch b/patches/0001-Revert-Enable-images-and-toolbar.-Move-patching-out-.patch new file mode 100644 index 000000000..0b02cb638 --- /dev/null +++ b/patches/0001-Revert-Enable-images-and-toolbar.-Move-patching-out-.patch @@ -0,0 +1,81 @@ +From 019e45174e75e114241736a082ad99a25db51634 Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Mon, 27 Dec 2010 11:44:26 +0100 +Subject: [PATCH] Revert "Enable images and toolbar. Move patching-out to GUB." + +This reverts commit 14e9b05d68e37861c99ef2f8956ea76a39b191a3. +--- + ikli/edit.scm | 21 ++++++++++++--------- + ikli/ikli.scm | 3 ++- + 2 files changed, 14 insertions(+), 10 deletions(-) + +diff --git a/ikli/edit.scm b/ikli/edit.scm +index a4ada36..65ccfd8 100644 +--- a/ikli/edit.scm ++++ b/ikli/edit.scm +@@ -50,9 +50,10 @@ exec guile-gnome-2 -l $0 -e test "$@" + #:modal #t #:destroy-with-parent #t)) + (hbox (make #:homogeneous #f #:spacing 8)) + (stock (make +- #:stock (gtk-stock-id 'dialog-question) +- #:icon-size (genum->value +- (make #:value 'dialog)))) ++ ;; #:stock (gtk-stock-id 'dialog-question) ++ ;; #:icon-size (genum->value ++ ;; (make #:value 'dialog)) ++ )) + (table (make #:n-columns 2 #:n-rows 2 #:homogeneous #f)) + (label1 (make #:label "_Numerator" #:use-underline #t)) + (entry1 (make )) +@@ -114,9 +115,10 @@ exec guile-gnome-2 -l $0 -e test "$@" + #:modal #t #:destroy-with-parent #t)) + (hbox (make #:homogeneous #f #:spacing 8)) + (stock (make +- #:stock (gtk-stock-id 'dialog-question) +- #:icon-size (genum->value +- (make #:value 'dialog)))) ++ ;; #:stock (gtk-stock-id 'dialog-question) ++ ;; #:icon-size (genum->value ++ ;; (make #:value 'dialog)) ++ )) + (table (make #:n-columns 2 #:n-rows 2 #:homogeneous #f)) + (label1 (make #:label "_Tonic" #:use-underline #t)) + (entry1 (make )) +@@ -220,9 +222,10 @@ exec guile-gnome-2 -l $0 -e test "$@" + #:modal #t #:destroy-with-parent #t)) + (hbox (make #:homogeneous #f #:spacing 8)) + (stock (make +- #:stock (gtk-stock-id 'dialog-question) +- #:icon-size (genum->value +- (make #:value 'dialog)))) ++ ;;#:stock (gtk-stock-id 'dialog-question) ++ ;; #:icon-size (genum->value ++ ;; (make #:value 'dialog)) ++ )) + (table (make #:n-columns 2 #:n-rows 2 #:homogeneous #f)) + (label1 (make #:label "_indent" #:use-underline #t)) + (entry1 (make )) +diff --git a/ikli/ikli.scm b/ikli/ikli.scm +index 7c59c41..c420ac3 100644 +--- a/ikli/ikli.scm ++++ b/ikli/ikli.scm +@@ -72,6 +72,7 @@ + #:message-type 'info + #:buttons 'close + ))) ++ (set-image dialog (make )) + (set-markup dialog text) + (connect dialog 'response (lambda (d arg1) + (gtk-widget-destroy dialog))) +@@ -276,7 +277,7 @@ + + (add window vbox) + (pack-start vbox (get-widget ui "/MenuBar") #f #f 0) +- (pack-start vbox (get-widget ui "/ToolBar") #f #f 0) ++ ;; (pack-start vbox (get-widget ui "/ToolBar") #f #f 0) + (if (slot-ref self 'use-cairo) + (gtk-scrolled-window-add-with-viewport scrolled-window + (slot-ref canvas 'widget)) +-- +1.7.1 + diff --git a/patches/0001-midi2ly-bump-version-in-output-to-2.7.38-oldest-supp.patch b/patches/0001-midi2ly-bump-version-in-output-to-2.7.38-oldest-supp.patch new file mode 100644 index 000000000..87d135403 --- /dev/null +++ b/patches/0001-midi2ly-bump-version-in-output-to-2.7.38-oldest-supp.patch @@ -0,0 +1,27 @@ +From 55e9efcac8a7b6c04a255e9d6de61d6a5b7ed21e Mon Sep 17 00:00:00 2001 +From: Jan Nieuwenhuizen +Date: Fri, 3 Dec 2010 22:37:19 +0100 +Subject: [PATCH] midi2ly: bump version in output to 2.7.38 (oldest supported). + +This makes midi2ly output actually processable without problems by +the latest lilypond. +--- + scripts/midi2ly.py | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py +index e0a00ae..eb15312 100644 +--- a/scripts/midi2ly.py ++++ b/scripts/midi2ly.py +@@ -826,7 +826,7 @@ def convert_midi (in_file, out_file): + + + s = '' +- s = tag + '\n\\version "2.7.18"\n\n' ++ s = tag + '\n\\version "2.7.38"\n\n' + for i in range (len (tracks)): + s = s + dump_track (tracks[i], i) + +-- +1.7.1 +