[SCM] yoshimi/master: Patches refreshed/removed.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Sun Dec 18 00:13:18 UTC 2016
The following commit has been merged in the master branch:
commit 0a86f1b77ce0bda0a5f712c0e06a2796ab1a7093
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Sun Dec 18 00:31:13 2016 +0100
Patches refreshed/removed.
diff --git a/debian/patches/01-gcc_flags.patch b/debian/patches/01-gcc_flags.patch
index f120c87..03da97d 100644
--- a/debian/patches/01-gcc_flags.patch
+++ b/debian/patches/01-gcc_flags.patch
@@ -11,7 +11,7 @@ Index: yoshimi/src/CMakeLists.txt
===================================================================
--- yoshimi.orig/src/CMakeLists.txt
+++ yoshimi/src/CMakeLists.txt
-@@ -100,6 +100,9 @@ set (BuildOptionsBasic
+@@ -102,6 +102,9 @@ set (BuildOptionsBasic
set (BuildOptionsDebug
"-O0 -g3 -ggdb -Wall -Wpointer-arith" CACHE STRING "Debug build flags")
@@ -21,7 +21,7 @@ Index: yoshimi/src/CMakeLists.txt
find_package (PkgConfig REQUIRED)
if (PKG_CONFIG_FOUND)
message(STATUS "Found pkg-config ${PKG_CONFIG_EXECUTABLE}")
-@@ -263,6 +266,7 @@ else (BuildForDebug)
+@@ -260,6 +263,7 @@ else (BuildForDebug)
set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
endif (BuildForCore2_X86_64)
endif (BuildForAMD_X86_64)
diff --git a/debian/patches/02-spelling.patch b/debian/patches/02-spelling.patch
deleted file mode 100644
index 0dc63bf..0000000
--- a/debian/patches/02-spelling.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Description: Spelling fix.
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: willgodfrey at musically.me.uk
-
-Index: yoshimi/src/UI/ADnoteUI.fl
-===================================================================
---- yoshimi.orig/src/UI/ADnoteUI.fl
-+++ yoshimi/src/UI/ADnoteUI.fl
-@@ -267,7 +267,7 @@ class ADvoiceUI {: {public Fl_Group, Syn
- voiceFMfreqenvgroup->activate();
- o->redraw();
- send_data(104, o->value());}
-- tooltip {Forced Relase} xywh {545 295 50 10} down_box DOWN_BOX labelfont 1 labelsize 10
-+ tooltip {Forced Release} xywh {545 295 50 10} down_box DOWN_BOX labelfont 1 labelsize 10
- code0 {o->value(pars->VoicePar[nvoice].PFMFreqEnvelopeEnabled);}
- }
- Fl_Counter {} {
-@@ -382,7 +382,7 @@ send_data(81, o->value());}
- voiceFMampenvgroup->activate();
- o->redraw();
- send_data(88, o->value());}
-- tooltip {Forced Relase} xywh {546 134 50 10} down_box DOWN_BOX labelfont 1 labelsize 10
-+ tooltip {Forced Release} xywh {546 134 50 10} down_box DOWN_BOX labelfont 1 labelsize 10
- code0 {o->value(pars->VoicePar[nvoice].PFMAmpEnvelopeEnabled);}
- }
- Fl_Value_Slider {} {
-@@ -543,7 +543,7 @@ send_data(82, o->value());}
- voicefreqenvgroup->activate();
- o->redraw();
- send_data(40, o->value());}
-- tooltip {Forced Relase} xywh {15 300 50 10} down_box DOWN_BOX labelfont 1 labelsize 10
-+ tooltip {Forced Release} xywh {15 300 50 10} down_box DOWN_BOX labelfont 1 labelsize 10
- code0 {o->value(pars->VoicePar[nvoice].PFreqEnvelopeEnabled);}
- }
- Fl_Group voicefreqlfogroup {
-@@ -563,7 +563,7 @@ send_data(82, o->value());}
- voicefreqlfogroup->activate();
- o->redraw();
- send_data(41, o->value());}
-- tooltip {Forced Relase} xywh {220 300 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
-+ tooltip {Forced Release} xywh {220 300 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
- code0 {o->value(pars->VoicePar[nvoice].PFreqLfoEnabled);}
- }
- Fl_Counter {} {
-@@ -935,7 +935,7 @@ send_data(1, o->value());}
- voiceampenvgroup->activate();
- o->redraw();
- send_data(8, o->value());}
-- tooltip {Forced Relase} xywh {15 110 50 10} down_box DOWN_BOX labelfont 1 labelsize 10
-+ tooltip {Forced Release} xywh {15 110 50 10} down_box DOWN_BOX labelfont 1 labelsize 10
- code0 {o->value(pars->VoicePar[nvoice].PAmpEnvelopeEnabled);}
- }
- Fl_Group voiceamplfogroup {
-@@ -955,7 +955,7 @@ send_data(1, o->value());}
- voiceamplfogroup->activate();
- o->redraw();
- send_data(9, o->value());}
-- tooltip {Forced Relase} xywh {15 180 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
-+ tooltip {Forced Release} xywh {15 180 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
- code0 {o->value(pars->VoicePar[nvoice].PAmpLfoEnabled);}
- }
- Fl_Check_Button {} {
-@@ -994,7 +994,7 @@ send_data(4, o->value());}
- voicefilterenvgroup->activate();
- o->redraw();
- send_data(72, o->value());}
-- tooltip {Forced Relase} xywh {255 110 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
-+ tooltip {Forced Release} xywh {255 110 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
- code0 {o->value(pars->VoicePar[nvoice].PFilterEnvelopeEnabled);}
- }
- Fl_Group voicefilterlfogroup {
-@@ -1014,7 +1014,7 @@ send_data(4, o->value());}
- voicefilterlfogroup->activate();
- o->redraw();
- send_data(73, o->value());}
-- tooltip {Forced Relase} xywh {255 180 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
-+ tooltip {Forced Release} xywh {255 180 55 10} down_box DOWN_BOX labelfont 1 labelsize 10
- code0 {o->value(pars->VoicePar[nvoice].PFilterLfoEnabled);}
- }
- }
-Index: yoshimi/src/UI/EnvelopeUI.fl
-===================================================================
---- yoshimi.orig/src/UI/EnvelopeUI.fl
-+++ yoshimi/src/UI/EnvelopeUI.fl
-@@ -372,7 +372,7 @@ send_data(type, 32, o->value());}
- label frcR
- callback {env->Pforcedrelease=(int)o->value();
- send_data(type, 48, o->value());}
-- tooltip {Forced Relase} xywh {410 165 40 15} down_box DOWN_BOX labelsize 10
-+ tooltip {Forced Release} xywh {410 165 40 15} down_box DOWN_BOX labelsize 10
- code0 {o->value(env->Pforcedrelease);}
- code1 {if (env->Pfreemode==0) o->hide();}
- }
-@@ -475,7 +475,7 @@ send_data(type, 4, o->value());}
- label frcR
- callback {env->Pforcedrelease=(int)o->value();
- send_data(type, 16, o->value());}
-- tooltip {Forced Relase} xywh {180 35 20 15} down_box DOWN_BOX labelsize 10 align 6
-+ tooltip {Forced Release} xywh {180 35 20 15} down_box DOWN_BOX labelsize 10 align 6
- code0 {o->value(env->Pforcedrelease);}
- }
- Fl_Dial e1envstretch {
-@@ -679,7 +679,7 @@ send_data(type, 7, o->value());}
- label frcR
- callback {env->Pforcedrelease=(int)o->value();
- send_data(type, 16, o->value());}
-- tooltip {Forced Relase} xywh {250 30 15 20} down_box DOWN_BOX labelsize 10 align 6
-+ tooltip {Forced Release} xywh {250 30 15 20} down_box DOWN_BOX labelsize 10 align 6
- code0 {o->value(env->Pforcedrelease);}
- }
- Fl_Button {} {
diff --git a/debian/patches/series b/debian/patches/series
index 5294a2e..ac0ed64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01-gcc_flags.patch
-02-spelling.patch
--
yoshimi packaging
More information about the pkg-multimedia-commits
mailing list