[SCM] musescore/master: drop 01-debundle-freetype.patch, use new USE_SYSTEM_FREETYPE option

[tg at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8f4abc6141ef7fcf073aed431daee981ffeebcc5
Author: mirabilos <tg at debian.org>
Date:   Fri Aug 4 23:35:06 2017 +0200

    drop 01-debundle-freetype.patch, use new USE_SYSTEM_FREETYPE option

diff --git a/debian/changelog b/debian/changelog
index 2ce3e78..bdbf68c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ musescore (2.1.0+dfsg1-0.1) UNRELEASED; urgency=medium
   * Non-maintainer upload with tentative maintainer agreement.
   * Upload to experimental.
   * New upstream version 2.1.0. (Closes: #861776)
+    - 01-debundle-freetype.patch was implemented by a cmake option
 
- -- Thorsten Glaser <tg at mirbsd.de>  Fri, 04 Aug 2017 23:24:27 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Fri, 04 Aug 2017 23:34:50 +0200
 
 musescore (2.0.3+dfsg1-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index a6afbcb..ddb93d3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Toby Smithe <tsmithe at ubuntu.com>,
 Build-Depends: cmake,
                debhelper (>= 9),
                libasound2-dev,
-               libfreetype6-dev,
+               libfreetype6-dev (>= 2.5.2),
                libjack-dev,
                libmp3lame-dev,
                libpulse-dev,
diff --git a/debian/patches/01-debundle-freetype.patch b/debian/patches/01-debundle-freetype.patch
deleted file mode 100644
index c24ced5..0000000
--- a/debian/patches/01-debundle-freetype.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Description: Use the system copy of freetype
-Author: James Cowgill <jcowgill at debian.org>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -218,18 +218,18 @@ SET(QT_USE_QTHELP        TRUE)
- ## freetype2 >= 2.5.2
- ##
- 
--##if (APPLE)
--##      PKGCONFIG1 (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR FREETYPE_LIBRARIES FREETYPE_CPP)
--##      if (FREETYPE_INCLUDE_DIRS)
--##          STRING(REGEX REPLACE  "\"" "" FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
--##          STRING(REGEX REPLACE  "\"" "" FREETYPE_LIBDIR ${FREETYPE_LIBDIR})
--##          message("freetype2 detected ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_LIBDIR} ${FREETYPE_LIBRARIES}")
--##      else (FREETYPE_INCLUDE_DIRS)
--##          message(FATAL_ERROR "freetype >= 2.5.2 is required\n")
--##      endif (FREETYPE_INCLUDE_DIRS)
--##else (APPLE)
--##    find_package(Freetype REQUIRED)
--##endif (APPLE)
-+if (APPLE)
-+      PKGCONFIG1 (freetype2 2.5.2 FREETYPE_INCLUDE_DIRS FREETYPE_LIBDIR FREETYPE_LIBRARIES FREETYPE_CPP)
-+      if (FREETYPE_INCLUDE_DIRS)
-+          STRING(REGEX REPLACE  "\"" "" FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS})
-+          STRING(REGEX REPLACE  "\"" "" FREETYPE_LIBDIR ${FREETYPE_LIBDIR})
-+          message("freetype2 detected ${FREETYPE_INCLUDE_DIRS} ${FREETYPE_LIBDIR} ${FREETYPE_LIBRARIES}")
-+      else (FREETYPE_INCLUDE_DIRS)
-+          message(FATAL_ERROR "freetype >= 2.5.2 is required\n")
-+      endif (FREETYPE_INCLUDE_DIRS)
-+else (APPLE)
-+    find_package(Freetype REQUIRED)
-+endif (APPLE)
- 
- ##
- ## alsa >= 1.0.0
-@@ -606,7 +606,6 @@ if (OSC)
-       subdirs (thirdparty/ofqf)
- endif (OSC)
- 
--subdirs (thirdparty/freetype)
- 
- 
- ##
-@@ -622,8 +621,7 @@ include_directories(
-    ${VORBIS_INCDIR}
-    ${SNDFILE_INCDIR}
-    ${LAME_INCLUDE_DIR}
--#   ${FREETYPE_INCLUDE_DIRS}
--   ${PROJECT_SOURCE_DIR}/thirdparty/freetype/include
-+   ${FREETYPE_INCLUDE_DIRS}
- )
- 
- ##
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -385,7 +385,7 @@ if (MINGW)
-       portaudio
-       portmidi
-       winmm
--      mscore_freetype
-+      freetype
-       z
-       )
- 
-@@ -477,7 +477,7 @@ else (MINGW)
-    target_link_libraries(mscore
-       ${ALSA_LIB}
-       ${QT_LIBRARIES}
--      mscore_freetype
-+      freetype
-       z
-       dl
-       pthread
---- a/mtest/CMakeLists.txt
-+++ b/mtest/CMakeLists.txt
-@@ -17,7 +17,6 @@ enable_testing()
- include_directories(
-       ${PROJECT_BINARY_DIR}
-       ${PROJECT_SOURCE_DIR}
--      ${PROJECT_SOURCE_DIR}/thirdparty/freetype/include
-       )
- 
- if (OMR)
-@@ -108,7 +107,7 @@ add_executable(
- target_link_libraries(
-       mtest
-       ${QT_LIBRARIES}
--      mscore_freetype
-+      freetype
-       )
- 
- set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
diff --git a/debian/patches/series b/debian/patches/series
index cc91bab..b95883e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-debundle-freetype.patch
 02-global-flags.patch
 03-debundle-openssl.patch
 04-manpage-errors.patch
diff --git a/debian/rules b/debian/rules
index 1444824..8198517 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,9 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 	dh $@ --buildsystem=cmake --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON
+	dh_auto_configure -- \
+	    -DCMAKE_SKIP_RPATH=ON \
+	    -DUSE_SYSTEM_FREETYPE=ON
 
 override_dh_auto_build:
 	dh_auto_build -- lrelease all

-- 
musescore packaging