Removing dependencies that are available as extensions

Removed packages:

- libgnutls28-dev
- libjpeg-dev
- libxcursor-dev
- libxdamage-dev
- libxext-dev
- libxi-dev
- libxinerama-dev
- libxml2-dev
- libxrandr-dev
- libxtst-dev
- libgcrypt20-dev
- libwebkit2gtk-4.0-dev
- libpcre2-dev
- python3-dev
- xdg-user-dirs
- gtk-3-examples
- libthai0
- libsndfile1
- libasyncns0
- libflac8
- libvorbisenc2
- libxau6
- libxdmcp6
- libogg0
- libvorbis0a
- libpcre2-8-0

I've improved some CMakeFiles that were not handling correctly the include and librari directories

3 files changed, 125 insertions, 48 deletions

diff --git a/cmake/FindAPPINDICATOR.cmake b/cmake/FindAPPINDICATOR.cmake
index ab05019b0..b50a10067 100644
--- a/cmake/FindAPPINDICATOR.cmake
+++ b/cmake/FindAPPINDICATOR.cmake
@@ -25,36 +25,39 @@ include(FindPackageHandleStandardArgs)
 pkg_check_modules(PC_AYATANA_APPINDICATOR ayatana-appindicator3-0.1)
 
 find_path(AYATANA_APPINDICATOR_INCLUDE_DIR NAMES libayatana-appindicator/app-indicator.h
-	HINTS ${PC_AYATANA_APPINDICATOR_INCLUDEDIR} ${PC_AYATANA_APPINDICATOR_INCLUDE_DIRS}
-	PATH_SUFFIXES libayatana-appindicator3-0.1)
+    HINTS ${PC_AYATANA_APPINDICATOR_INCLUDEDIR} ${PC_AYATANA_APPINDICATOR_INCLUDE_DIRS}
+    )
 
-find_library(AYATANA_APPINDICATOR_LIBRARY NAMES ayatana-appindicator3)
+find_library(AYATANA_APPINDICATOR_LIBRARY NAMES ayatana-appindicator3
+    HINTS ${PC_AYATANA_APPINDICATOR_LIBDIR} ${PC_AYATANA_APPINDICATOR_LIBRARY_DIRS}
+    )
 
-if (AYATANA_APPINDICATOR_INCLUDE_DIR AND AYATANA_APPINDICATOR_LIBRARY)
-	find_package_handle_standard_args(APPINDICATOR DEFAULT_MSG AYATANA_APPINDICATOR_LIBRARY AYATANA_APPINDICATOR_INCLUDE_DIR)
+if(AYATANA_APPINDICATOR_INCLUDE_DIR AND AYATANA_APPINDICATOR_LIBRARY)
+    find_package_handle_standard_args(APPINDICATOR DEFAULT_MSG AYATANA_APPINDICATOR_LIBRARY AYATANA_APPINDICATOR_INCLUDE_DIR)
 endif()
 
-if (APPINDICATOR_FOUND)
-	add_definitions(-DHAVE_AYATANA_LIBAPPINDICATOR)
-	set(APPINDICATOR_LIBRARIES ${AYATANA_APPINDICATOR_LIBRARY})
-	set(APPINDICATOR_INCLUDE_DIRS ${AYATANA_APPINDICATOR_INCLUDE_DIR})
+if(APPINDICATOR_FOUND)
+    add_definitions(-DHAVE_AYATANA_LIBAPPINDICATOR)
+    set(APPINDICATOR_LIBRARIES ${AYATANA_APPINDICATOR_LIBRARY})
+    set(APPINDICATOR_INCLUDE_DIRS ${AYATANA_APPINDICATOR_INCLUDE_DIR})
 else()
-	# Try with normal libappindicator
-	pkg_check_modules(PC_APPINDICATOR appindicator3-0.1)
+    # Try with normal libappindicator
+    pkg_check_modules(PC_APPINDICATOR appindicator3-0.1)
 
-	find_path(APPINDICATOR_INCLUDE_DIR NAMES libappindicator/app-indicator.h
-		HINTS ${PC_APPINDICATOR_INCLUDEDIR} ${PC_APPINDICATOR_INCLUDE_DIRS}
-		PATH_SUFFIXES libappindicator3-0.1)
+find_path(APPINDICATOR_INCLUDE_DIR NAMES libappindicator/app-indicator.h
+    HINTS ${PC_APPINDICATOR_INCLUDEDIR} ${PC_APPINDICATOR_INCLUDE_DIRS}
+    )
 
-	find_library(APPINDICATOR_LIBRARY NAMES appindicator3)
+find_library(APPINDICATOR_LIBRARY NAMES appindicator3
+    HINTS ${PC_APPINDICATOR_LIBDIR} ${PC_APPINDICATOR_LIBRARY_DIRS}
+    )
 
-	find_package_handle_standard_args(APPINDICATOR DEFAULT_MSG APPINDICATOR_LIBRARY APPINDICATOR_INCLUDE_DIR)
+    find_package_handle_standard_args(APPINDICATOR DEFAULT_MSG APPINDICATOR_LIBRARY APPINDICATOR_INCLUDE_DIR)
 
-	if(APPINDICATOR_FOUND)
-		set(APPINDICATOR_LIBRARIES ${APPINDICATOR_LIBRARY})
-		set(APPINDICATOR_INCLUDE_DIRS ${APPINDICATOR_INCLUDE_DIR})
-	endif()
+    if(APPINDICATOR_FOUND)
+        set(APPINDICATOR_LIBRARIES ${APPINDICATOR_LIBRARY})
+        set(APPINDICATOR_INCLUDE_DIRS ${APPINDICATOR_INCLUDE_DIR})
+    endif()
 endif()
 
 mark_as_advanced(APPINDICATOR_INCLUDE_DIR APPINDICATOR_LIBRARY)
-
diff --git a/cmake/FindPCRE2.cmake b/cmake/FindPCRE2.cmake
index 9cd074ef7..eb0a444c9 100644
--- a/cmake/FindPCRE2.cmake
+++ b/cmake/FindPCRE2.cmake
@@ -17,31 +17,40 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA  02110-1301, USA.
 
-include(FindPackageHandleStandardArgs)
-
-pkg_check_modules(PC_LIBPCRE2 libpcre2-8-0)
-
-
-find_path(PCRE2_INCLUDE_DIR
-  NAMES pcre2.h
-  PATHS ../../../../libs
-        /usr
-  PATH_SUFFIXES include)
-
-find_library(PCRE2_LIBRARY
-  NAMES pcre2-8
-  PATHS ../../../../libs
-        /usr
-  PATH_SUFFIXES lib)
-
-if (PCRE2_INCLUDE_DIR AND PCRE2_LIBRARY)
-  message(STATUS "Found pcre2 headers at ${PCRE2_INCLUDE_DIR}")
-  message(STATUS "Found pcre2 libraries at ${PCRE2_LIBRARY}")
-  set(PCRE2_INCLUDE_DIRS ${PCRE2_INCLUDE_DIR})
-  set(PCRE2_LIBRARIES ${PCRE2_LIBRARY})
-  set(PCRE2_FOUND yes)
-else()
-  set(PCRE2_INCLUDE_DIRS)
-  set(PCRE2_LIBRARIES)
-  set(PCRE2_FOUND no)
+#
+# PCRE2_INCLUDE_DIRS
+# PCRE2_LIBRARIES
+# PCRE2_CFLAGS
+
+find_package(PkgConfig)
+
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(_PCRE2 libpcre2-8)
+endif(PKG_CONFIG_FOUND)
+
+find_library(PCRE2_LIB pcre
+    HINTS
+    ${_PCRE2_LIBRARY_DIRS}
+    ${COMMON_LIB_DIR}
+)
+
+if(PCRE2_LIB)
+    set(PCRE2_LIBRARIES ${PCRE2_LIB})
+    message(STATUS "PCRE2-Libs: ${PCRE2_LIBRARIES}")
+endif()
+
+find_path(PCRE2_INCLUDE_DIR pcre2.h
+    PATHS
+    ${_PCRE2_INCLUDE_DIRS}
+    ${COMMON_INCLUDE_DIR}
+)
+
+
+if(PCRE2_INCLUDE_DIR)
+    set(PCRE2_INCLUDE_DIRS ${PCRE2_INCLUDE_DIR})
+    message(STATUS "PCRE2-Include-Dirs: ${PCRE2_INCLUDE_DIRS}")
+endif()
+
+if(PCRE2_INCLUDE_DIRS)
+    set(PCRE2_FOUND TRUE)
 endif()
diff --git a/cmake/FindWEBKIT2GTK.cmake b/cmake/FindWEBKIT2GTK.cmake
new file mode 100644
index 000000000..c766ebfe1
--- /dev/null
+++ b/cmake/FindWEBKIT2GTK.cmake
@@ -0,0 +1,65 @@
+# Remmina - The GTK+ Remote Desktop Client
+#
+# Copyright (C) 2015-2022 Antenore Gatta, Giovanni Panozzo
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA  02110-1301, USA.
+#
+#  In addition, as a special exception, the copyright holders give
+#  permission to link the code of portions of this program with the
+#  OpenSSL library under certain conditions as described in each
+#  individual source file, and distribute linked combinations
+#  including the two.
+#  You must obey the GNU General Public License in all respects
+#  for all of the code used other than OpenSSL. *  If you modify
+#  file(s) with this exception, you may extend this exception to your
+#  version of the file(s), but you are not obligated to do so. *  If you
+#  do not wish to do so, delete this exception statement from your
+#  version. *  If you delete this exception statement from all source
+#  files in the program, then also delete it here.
+
+find_package(PkgConfig)
+
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(_WEBKIT2GTK webkit2gtk-4.0)
+endif(PKG_CONFIG_FOUND)
+
+find_library(WEBKIT2GTK_LIB webkit2gtk-4.0
+    HINTS
+    ${_WEBKIT2GTK_LIBRARY_DIRS}
+    ${COMMON_LIB_DIR}
+)
+
+if(WEBKIT2GTK_LIB)
+    set(WEBKIT2GTK_LIBRARIES ${WEBKIT2GTK_LIB})
+    message(STATUS "WEBKIT2GTK-Libs: ${WEBKIT2GTK_LIBRARIES}")
+endif()
+
+find_path(WEBKIT2GTK_INCLUDE_DIR webkit2.h
+    PATH_SUFFIXES webkit2
+    PATHS
+    ${_WEBKIT2GTK_INCLUDE_DIRS}
+    ${COMMON_INCLUDE_DIR}
+)
+
+
+if(WEBKIT2GTK_INCLUDE_DIR)
+    set(WEBKIT2GTK_INCLUDE_DIRS ${WEBKIT2GTK_INCLUDE_DIR})
+    message(STATUS "WEBKIT2GTK-Include-Dirs: ${WEBKIT2GTK_INCLUDE_DIRS}")
+endif()
+
+if(WEBKIT2GTK_INCLUDE_DIRS)
+    set(WEBKIT2GTK_FOUND TRUE)
+endif()