diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index ce6926a4a..503f740f0 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -959,7 +959,6 @@ jobs: -DENABLE_TESTS=${{ (needs.what-to-make.outputs.make-tests == 'true') && 'ON' || 'OFF' }} \ -DENABLE_UTILS=${{ (needs.what-to-make.outputs.make-utils == 'true') && 'ON' || 'OFF' }} \ -DREBUILD_WEB=${{ (needs.what-to-make.outputs.make-web == 'true') && 'ON' || 'OFF' }} \ - -DENABLE_DEPRECATED=ON \ -DENABLE_WERROR=OFF \ -DRUN_CLANG_TIDY=OFF \ -DUSE_SYSTEM_DEFAULT=ON \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 560d60e4b..30391ddcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,6 @@ option(ENABLE_WERROR "Treat warnings as errors" OFF) option(ENABLE_NLS "Enable native language support" ON) option(INSTALL_DOC "Build/install documentation" ON) option(INSTALL_LIB "Install the library" OFF) -tr_auto_option(ENABLE_DEPRECATED "Allow deprecated API use of upstream packages, e.g. GTK" AUTO) tr_auto_option(USE_SYSTEM_DEFAULT "Default value for USE_SYSTEM_* options" AUTO) tr_auto_option(RUN_CLANG_TIDY "Run clang-tidy on the code" ${USE_SYSTEM_DEFAULT}) tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" ${USE_SYSTEM_DEFAULT}) @@ -267,14 +266,6 @@ find_package(PkgConfig QUIET) find_package(CURL ${CURL_MINIMUM} REQUIRED) -if(ENABLE_DEPRECATED STREQUAL "AUTO") - if(DEFINED ENV{CI}) - set(ENABLE_DEPRECATED OFF) - else() - set(ENABLE_DEPRECATED ON) - endif() -endif() - set(CRYPTO_PKG "") if(WITH_CRYPTO STREQUAL "AUTO" OR WITH_CRYPTO STREQUAL "ccrypto") tr_get_required_flag(WITH_CRYPTO CCRYPTO_IS_REQUIRED) diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt index b23a0e540..76fc79a30 100644 --- a/gtk/CMakeLists.txt +++ b/gtk/CMakeLists.txt @@ -166,22 +166,6 @@ target_compile_definitions(${TR_NAME}-gtk GETTEXT_PACKAGE="${TR_NAME}-gtk" $<$:WITH_UTP>) -if(NOT ENABLE_DEPRECATED) - target_compile_definitions(${TR_NAME}-gtk - PRIVATE - G_DISABLE_DEPRECATED - GDK_PIXBUF_DISABLE_DEPRECATED - GDK_DISABLE_DEPRECATED - GTK_DISABLE_DEPRECATED - PANGO_DISABLE_DEPRECATED - GDKMM_DISABLE_DEPRECATED - GIOMM_DISABLE_DEPRECATED - GLIBMM_DISABLE_DEPRECATED - GTKMM_DISABLE_DEPRECATED - PANGOMM_DISABLE_DEPRECATED - SIGCXX_DISABLE_DEPRECATED) -endif() - target_compile_options(${TR_NAME}-gtk PRIVATE $<$:$,/WX,-Werror>> diff --git a/gtk/SystemTrayIcon.cc b/gtk/SystemTrayIcon.cc index c1d937cfc..41b3c555f 100644 --- a/gtk/SystemTrayIcon.cc +++ b/gtk/SystemTrayIcon.cc @@ -3,11 +3,6 @@ // or any future license endorsed by Mnemosyne LLC. // License text can be found in the licenses/ folder. -// _AppIndicatorClass::{fallback,unfallback} use deprecated GtkStatusIcon -#undef GTK_DISABLE_DEPRECATED -// We're using deprecated Gtk::StatusItem ourselves as well -#undef GTKMM_DISABLE_DEPRECATED - #include "SystemTrayIcon.h" #include "Actions.h"