[SCM] musescore/master: patch: use system OpenSSL headers to build kQOAuth
jcowgill at users.alioth.debian.org
jcowgill at users.alioth.debian.org
Mon Jul 11 10:37:20 UTC 2016
The following commit has been merged in the master branch:
commit f9efe735dbfbae6757eb1ee755a43af052f8343d
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Thu Jul 7 23:02:17 2016 +0200
patch: use system OpenSSL headers to build kQOAuth
diff --git a/debian/patches/03-debundle-openssl.patch b/debian/patches/03-debundle-openssl.patch
new file mode 100644
index 0000000..d910a3f
--- /dev/null
+++ b/debian/patches/03-debundle-openssl.patch
@@ -0,0 +1,30 @@
+Description: Remove OpenSSL references from kQOAuth
+ The code will happily build without OpenSSL.
+Author: James Cowgill <jcowgill at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/thirdparty/kQOAuth/CMakeLists.txt
++++ b/thirdparty/kQOAuth/CMakeLists.txt
+@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
+ set_target_properties (
+ kqoauth
+ PROPERTIES
+- COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
++ COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
+ )
+
+ xcode_pch(kqoauth all)
+--- a/thirdparty/kQOAuth/kqoauthutils.cpp
++++ b/thirdparty/kQOAuth/kqoauthutils.cpp
+@@ -24,11 +24,6 @@
+ #include <QtDebug>
+ #include "kqoauthutils.h"
+
+-#include <openssl/pem.h>
+-#include <openssl/err.h>
+-#include <openssl/ssl.h>
+-#include <openssl/evp.h>
+-
+
+ QString KQOAuthUtils::hmac_sha1(const QString &message, const QString &key)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index 41b63c2..06499c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-debundle-freetype.patch
02-global-flags.patch
+03-debundle-openssl.patch
--
musescore packaging
More information about the pkg-multimedia-commits
mailing list