From de5ad90756855ecbb5be46afcf4dc8ae7c9d2eba Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Thu, 20 Feb 2025 11:55:29 +0100 Subject: [PATCH] qgis{,-qt6}-dev: remove final part from patch (qgis/QGIS#60676 merged) --- src/qgis-dev/osgeo4w/patch | 74 ---------------------------------- src/qgis-qt6-dev/osgeo4w/patch | 74 ---------------------------------- 2 files changed, 148 deletions(-) diff --git a/src/qgis-dev/osgeo4w/patch b/src/qgis-dev/osgeo4w/patch index c8784af3..e69de29b 100644 --- a/src/qgis-dev/osgeo4w/patch +++ b/src/qgis-dev/osgeo4w/patch @@ -1,74 +0,0 @@ -diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake -index 29ddf2602ce..78c2f124db4 100644 ---- a/cmake/FindPostgres.cmake -+++ b/cmake/FindPostgres.cmake -@@ -23,9 +23,6 @@ if(${PostgreSQL_FOUND}) - set(POSTGRES_INCLUDE_DIR ${PostgreSQL_INCLUDE_DIRS}) - set(POSTGRES_LIBRARY ${PostgreSQL_LIBRARIES}) - set(POSTGRES_FOUND TRUE) -- if(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") -- set(HAVE_PGCONFIG TRUE) -- endif() - return() - endif() - -@@ -118,11 +115,6 @@ ENDIF(WIN32 AND NOT ANDROID) - - IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY) - SET(POSTGRES_FOUND TRUE) -- IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") -- SET(HAVE_PGCONFIG TRUE) -- ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") -- SET(HAVE_PGCONFIG FALSE) -- ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") - ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY) - - -diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt -index b042c860811..d3a4910a039 100644 ---- a/src/app/CMakeLists.txt -+++ b/src/app/CMakeLists.txt -@@ -541,7 +541,7 @@ target_compile_features(qgis_app PRIVATE cxx_std_17) - - target_compile_definitions(qgis_app PRIVATE "QT_PLUGINS_DIR=\"${QT_PLUGINS_DIR}\"") - if (POSTGRES_FOUND) -- target_compile_definitions(qgis_app PRIVATE -DPOSTGRESQL_VERSION=${PostgreSQL_VERSION_STRING}) -+ target_compile_definitions(qgis_app PRIVATE -DPOSTGRESQL_VERSION=\"${PostgreSQL_VERSION_STRING}\") - endif() - - target_include_directories(qgis_app PUBLIC -diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp -index c50a1c681e3..2e58fb609f5 100644 ---- a/src/app/qgisapp.cpp -+++ b/src/app/qgisapp.cpp -@@ -538,20 +538,10 @@ - - // Editor widgets - #include "qgseditorwidgetregistry.h" -+ - // - // Conditional Includes - // --#ifdef HAVE_PGCONFIG --#undef PACKAGE_BUGREPORT --#undef PACKAGE_NAME --#undef PACKAGE_STRING --#undef PACKAGE_TARNAME --#undef PACKAGE_VERSION --#include --#else --#define PG_VERSION "unknown" --#endif -- - #include - - #ifdef HAVE_SPATIALITE -@@ -5569,7 +5565,7 @@ QString QgisApp::getVersionString() - // postgres - versionString += QStringLiteral( "%1" ).arg( tr( "PostgreSQL client version" ) ); - #ifdef HAVE_POSTGRESQL -- versionString += QStringLiteral( PG_VERSION ); -+ versionString += QStringLiteral( POSTGRESQL_VERSION ); - #else - versionString += tr( "No support" ); - #endif diff --git a/src/qgis-qt6-dev/osgeo4w/patch b/src/qgis-qt6-dev/osgeo4w/patch index c8784af3..e69de29b 100644 --- a/src/qgis-qt6-dev/osgeo4w/patch +++ b/src/qgis-qt6-dev/osgeo4w/patch @@ -1,74 +0,0 @@ -diff --git a/cmake/FindPostgres.cmake b/cmake/FindPostgres.cmake -index 29ddf2602ce..78c2f124db4 100644 ---- a/cmake/FindPostgres.cmake -+++ b/cmake/FindPostgres.cmake -@@ -23,9 +23,6 @@ if(${PostgreSQL_FOUND}) - set(POSTGRES_INCLUDE_DIR ${PostgreSQL_INCLUDE_DIRS}) - set(POSTGRES_LIBRARY ${PostgreSQL_LIBRARIES}) - set(POSTGRES_FOUND TRUE) -- if(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") -- set(HAVE_PGCONFIG TRUE) -- endif() - return() - endif() - -@@ -118,11 +115,6 @@ ENDIF(WIN32 AND NOT ANDROID) - - IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY) - SET(POSTGRES_FOUND TRUE) -- IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") -- SET(HAVE_PGCONFIG TRUE) -- ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") -- SET(HAVE_PGCONFIG FALSE) -- ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h") - ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY) - - -diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt -index b042c860811..d3a4910a039 100644 ---- a/src/app/CMakeLists.txt -+++ b/src/app/CMakeLists.txt -@@ -541,7 +541,7 @@ target_compile_features(qgis_app PRIVATE cxx_std_17) - - target_compile_definitions(qgis_app PRIVATE "QT_PLUGINS_DIR=\"${QT_PLUGINS_DIR}\"") - if (POSTGRES_FOUND) -- target_compile_definitions(qgis_app PRIVATE -DPOSTGRESQL_VERSION=${PostgreSQL_VERSION_STRING}) -+ target_compile_definitions(qgis_app PRIVATE -DPOSTGRESQL_VERSION=\"${PostgreSQL_VERSION_STRING}\") - endif() - - target_include_directories(qgis_app PUBLIC -diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp -index c50a1c681e3..2e58fb609f5 100644 ---- a/src/app/qgisapp.cpp -+++ b/src/app/qgisapp.cpp -@@ -538,20 +538,10 @@ - - // Editor widgets - #include "qgseditorwidgetregistry.h" -+ - // - // Conditional Includes - // --#ifdef HAVE_PGCONFIG --#undef PACKAGE_BUGREPORT --#undef PACKAGE_NAME --#undef PACKAGE_STRING --#undef PACKAGE_TARNAME --#undef PACKAGE_VERSION --#include --#else --#define PG_VERSION "unknown" --#endif -- - #include - - #ifdef HAVE_SPATIALITE -@@ -5569,7 +5565,7 @@ QString QgisApp::getVersionString() - // postgres - versionString += QStringLiteral( "%1" ).arg( tr( "PostgreSQL client version" ) ); - #ifdef HAVE_POSTGRESQL -- versionString += QStringLiteral( PG_VERSION ); -+ versionString += QStringLiteral( POSTGRESQL_VERSION ); - #else - versionString += tr( "No support" ); - #endif