[SCM] yoshimi/master: Removed/Refreshed patches - applied upstream.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a1aafcb83fee6744b077939dea685c7900f8e7b4
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jun 10 01:27:27 2014 +0200

    Removed/Refreshed patches - applied upstream.

diff --git a/debian/patches/01-gcc_flags.patch b/debian/patches/01-gcc_flags.patch
index 72b02c8..755b6d7 100644
--- a/debian/patches/01-gcc_flags.patch
+++ b/debian/patches/01-gcc_flags.patch
@@ -9,11 +9,11 @@ Forwarded: yes
 
 Index: yoshimi/src/CMakeLists.txt
 ===================================================================
---- yoshimi.orig/src/CMakeLists.txt	2014-03-20 12:26:13.702271262 +0100
-+++ yoshimi/src/CMakeLists.txt	2014-03-20 12:27:18.278644212 +0100
-@@ -81,6 +81,9 @@
+--- yoshimi.orig/src/CMakeLists.txt
++++ yoshimi/src/CMakeLists.txt
+@@ -81,6 +81,9 @@ set (BuildOptionsBasic
  set (BuildOptionsDebug
-     "-O0 -g3 -ggdb -Wall -Wpointer-arith -ldl" CACHE STRING "Debug build flags")
+     "-O0 -g3 -ggdb -Wall -Wpointer-arith" CACHE STRING "Debug build flags")
  
 +set (BuildOptionsDebian
 +    "-O3 -ffast-math -fomit-frame-pointer -ldl" CACHE STRING "Debian 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}")
-@@ -205,6 +208,7 @@
+@@ -205,6 +208,7 @@ else (BuildForDebug)
              set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
          endif (BuildForCore2_X86_64)
      endif (BuildForAMD_X86_64)
diff --git a/debian/patches/03-fix_compat_9_build.patch b/debian/patches/03-fix_compat_9_build.patch
deleted file mode 100644
index c7389ce..0000000
--- a/debian/patches/03-fix_compat_9_build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Origin: Debian
-Description: Fix FTBS with compat 9. Thanks to Sebastian Ramacher <sramacher at debian.org>.
-Forwarded: yes
-
-Index: yoshimi/src/UI/MasterUI.fl
-===================================================================
---- yoshimi.orig/src/UI/MasterUI.fl	2013-08-19 04:01:42.000000000 +0200
-+++ yoshimi/src/UI/MasterUI.fl	2013-08-19 04:04:08.568969766 +0200
-@@ -880,10 +880,10 @@
-             if (result == -10)
-             {
-                 msg += ",\\nit does not appear to be a valid parameter file.";
--                fl_alert(msg.c_str());
-+                fl_alert("%s", msg.c_str());
-             }
-             else
--                fl_alert(msg.c_str());
-+                fl_alert("%s", msg.c_str());
-         }} {}
-   }
-   Function {do_save_master(const char* file = NULL)} {} {
diff --git a/debian/patches/04-fix_FTBFS.patch b/debian/patches/04-fix_FTBFS.patch
deleted file mode 100644
index ab65537..0000000
--- a/debian/patches/04-fix_FTBFS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Origin: Debian
-Description: Fix FTBFS. Thanks to upstream.
-Forwarded: no
-
-Index: yoshimi/src/CMakeLists.txt
-===================================================================
---- yoshimi.orig/src/CMakeLists.txt	2014-03-18 22:03:05.360151251 +0100
-+++ yoshimi/src/CMakeLists.txt	2014-03-18 22:06:37.213928081 +0100
-@@ -359,6 +359,7 @@
-     ${LIBSNDFILE_LIBRARIES}
-     ${FFTW3F_LIBRARIES}
-     ${LIBCAIRO_LIBRARIES}
-+    z
- )
- 
- set (CMAKE_EXE_LINKER_FLAGS "-ldl")
diff --git a/debian/patches/05-fix_hardening.patch b/debian/patches/05-fix_hardening.patch
deleted file mode 100644
index 4e1bf4a..0000000
--- a/debian/patches/05-fix_hardening.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Origin: Debian
-Description: Fix passing LDFLAGS.
-Forwarded: yes
-
-Index: yoshimi/src/CMakeLists.txt
-===================================================================
---- yoshimi.orig/src/CMakeLists.txt	2014-03-20 16:55:52.531720116 +0100
-+++ yoshimi/src/CMakeLists.txt	2014-03-20 16:58:09.692457955 +0100
-@@ -362,11 +362,11 @@
-     z
- )
- 
--set (CMAKE_EXE_LINKER_FLAGS "-ldl")
-+#set (CMAKE_EXE_LINKER_FLAGS "-ldl")
- 
- add_executable (yoshimi ${ProgSources} main.cpp)
- 
--target_link_libraries (yoshimi ${ExternLibraries})
-+target_link_libraries (yoshimi ${ExternLibraries} "-dl")
- 
- install (TARGETS yoshimi RUNTIME DESTINATION bin)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 6f426d3..ac0ed64 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
 01-gcc_flags.patch
-03-fix_compat_9_build.patch
-04-fix_FTBFS.patch
-05-fix_hardening.patch

-- 
yoshimi packaging