File guayadeque.patch of Package guayadeque
---
CMakeLists.txt | 5 -----
src/MainApp.cpp | 15 ---------------
2 files changed, 20 deletions(-)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,11 +22,6 @@
find_package(PkgConfig REQUIRED)
-set(SEARCH_LIBS /usr/lib /usr/local/lib)
-
-# [sl 2020-05-23] according to https://cmake.org/cmake/help/v3.0/module/FindwxWidgets.html
-set(wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
-
find_package(wxWidgets COMPONENTS base core adv net html xml aui qa)
if (NOT wxWidgets_FOUND)
--- a/src/MainApp.cpp
+++ b/src/MainApp.cpp
@@ -108,11 +108,6 @@
wxCopyFile( wxT( DATADIR "/guayadeque.default.conf" ),
guPATH_CONFIG_FILENAME, false );
}
- else if( wxFileExists( wxT( "/usr/local/share/guayadeque/guayadeque.default.conf" ) ) )
- {
- wxCopyFile( wxT( "/usr/local/share/guayadeque/guayadeque.default.conf" ),
- guPATH_CONFIG_FILENAME, false );
- }
guLogMessage( wxT( "Created the default configuration file" ) );
}
@@ -123,11 +118,6 @@
wxCopyFile( wxT( DATADIR "/equalizers.default.conf" ),
guPATH_EQUALIZERS_FILENAME, false );
}
- else if( wxFileExists( wxT( "/usr/local/share/guayadeque/equalizers.default.conf" ) ) )
- {
- wxCopyFile( wxT( "/usr/local/share/guayadeque/equalizers.default.conf" ),
- guPATH_EQUALIZERS_FILENAME, false );
- }
guLogMessage( wxT( "Created the default equalizers file" ) );
}
@@ -138,11 +128,6 @@
wxCopyFile( wxT( DATADIR "/lyrics_sources.xml" ),
guPATH_LYRICS_SOURCES_FILENAME, false );
}
- else if( wxFileExists( wxT( "/usr/local/share/guayadeque/lyrics_sources.xml" ) ) )
- {
- wxCopyFile( wxT( "/usr/local/share/guayadeque/lyrics_sources.xml" ),
- guPATH_LYRICS_SOURCES_FILENAME, false );
- }
guLogMessage( wxT( "Created the default lyrics sources file" ) );
}