[SCM] qsynth/master: Patches applied upstream - removed.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Wed Jun 28 07:00:09 UTC 2017


The following commit has been merged in the master branch:
commit 7e99e8ce73f57a6c420c6e3beee0979d926730f8
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Jun 28 07:18:43 2017 +0200

    Patches applied upstream - removed.

diff --git a/debian/patches/2001-libx11_underlinkage.patch b/debian/patches/2001-libx11_underlinkage.patch
deleted file mode 100644
index babde27..0000000
--- a/debian/patches/2001-libx11_underlinkage.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Add -lX11 to ld to fix FTBFS.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713488
-From: http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/saucy/qsynth/saucy/revision/17/debian/patches/1002_libx11_underlinkage.patch
----
- src/CMakeLists.txt |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: qsynth/src/CMakeLists.txt
-===================================================================
---- qsynth.orig/src/CMakeLists.txt
-+++ qsynth/src/CMakeLists.txt
-@@ -110,6 +110,7 @@ target_link_libraries ( qsynth
-     ${QT_LIBRARIES}
-     ${MATH_LIBRARY}
-     ${FLUIDSYNTH_LIBRARY}
-+    X11
- )
- qt5_use_modules (qsynth Core Gui Widgets)
- 
diff --git a/debian/patches/4001-qsynth.patch b/debian/patches/4001-qsynth.patch
deleted file mode 100644
index 8275b8e..0000000
--- a/debian/patches/4001-qsynth.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Make the build reproducible
-Author: Chris Lamb <lamby at debian.org>
-Last-Update: 2016-11-19
-Forwarded: rncbc at rncbc.org
-
-Index: qsynth/configure.ac
-===================================================================
---- qsynth.orig/configure.ac
-+++ qsynth/configure.ac
-@@ -6,9 +6,11 @@ AC_CONFIG_HEADERS(src/config.h)
- AC_CONFIG_FILES(Makefile qsynth.spec src/src.pri src/qsynth.desktop)
- 
- # Build date and time.
--AC_CACHE_VAL([ac_cv_build_date],
--   [ac_cv_build_date=$(date +"%b %d %Y %H:%M %z")])
--ac_build_date="$ac_cv_build_date"
-+if test x"$SOURCE_DATE_EPOCH" = "x"; then
-+   ac_build_date=`date +"%b %d %Y %H:%M %z"`
-+else
-+   ac_build_date=`LC_ALL=C date --utc --date="@$SOURCE_DATE_EPOCH" +"%b %d %Y %H:%M %z"`
-+fi
- AC_DEFINE_UNQUOTED(CONFIG_BUILD_DATE, ["$ac_build_date"], [Build date and time.])
- 
- # Build version string.
diff --git a/debian/patches/series b/debian/patches/series
index b53b64b..214e6af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 1001-soundfont_default_dir.patch
-2001-libx11_underlinkage.patch
 3001-hardening.patch
-4001-qsynth.patch

-- 
qsynth packaging



More information about the pkg-multimedia-commits mailing list