[neon/extras/gcompris-qt/Neon/unstable] debian/patches: remove patch which does not apply

Jonathan Esk-Riddell null at kde.org
Thu Jul 28 14:33:30 BST 2022


Git commit 71378fb3d42be891ec08ae144109f03b172103fb by Jonathan Esk-Riddell.
Committed on 28/07/2022 at 13:33.
Pushed by jriddell into branch 'Neon/unstable'.

remove patch which does not apply

D  +0    -30   debian/patches/disable-openssl.diff
D  +0    -1    debian/patches/series

https://invent.kde.org/neon/extras/gcompris-qt/commit/71378fb3d42be891ec08ae144109f03b172103fb

diff --git a/debian/patches/disable-openssl.diff b/debian/patches/disable-openssl.diff
deleted file mode 100644
index 977cb3c..0000000
--- a/debian/patches/disable-openssl.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Disable the OpenSSL requirement
- GCompris does not use OpenSSL directly, so there is no need to require or link
- to it.  This also avoids copying the OpenSSL, and the ICU libraries to the
- GCompris installation.
-Last-Update: 2019-07-05
-Forwarded: no
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,7 +117,7 @@ endif()
- #   message(FATAL_ERROR "ECM ${ECM_VERSION} not compatible with Qt ${Qt5Core_VERSION} version for android.")
- # endif()
- 
--if((UNIX AND NOT APPLE AND NOT SAILFISHOS AND NOT ANDROID) OR WIN32)
-+if(FALSE)
-     find_package(OpenSSL REQUIRED)
- endif()
- 
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -218,7 +218,7 @@ if(BUILD_STANDALONE)
-   #install(DIRECTORY ${_qt_qml_path}/QtGraphicalEffects DESTINATION ${_qt_qml_destdir})
- 
-   # Fix for Linux 'make package' that fails to link with libicu; also package OpenSSL libs from system
--  if(UNIX AND NOT APPLE AND NOT SAILFISHOS AND NOT ANDROID)
-+  if(FALSE)
-     add_library( libicudata SHARED IMPORTED )
-     file(GLOB LIBICUDATA_SO "${Qt5_DIR}/../../libicudata.so.[0-9][0-9]")
-     if("${LIBICUDATA_SO}" STREQUAL "")
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e7b2a86..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-disable-openssl.diff


More information about the Neon-commits mailing list