From 8aac0353cd1b0320181c4c92f96d20b42dae5451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 19 Mar 2018 14:55:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BF=D0=B0=D1=82=D1=87=20=D0=B4=D0=BB=D1=8F=20nomacs?= =?UTF-8?q?=20(=D0=B1=D1=8D=D0=BA=D0=BF=D0=BE=D1=80=D1=82=20=D0=B8=D0=B7?= =?UTF-8?q?=20origin/master)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cmake: Stop calling QT5_WRAP_CPP() when building quazip and libqpsd. --- .../media-gfx/nomacs/.calculate_directory | 1 + .../media-gfx/nomacs/libqpsd_fix.patch | 77 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/.calculate_directory create mode 100644 profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/.calculate_directory b/profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/.calculate_directory new file mode 100644 index 000000000..5c965ea54 --- /dev/null +++ b/profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/.calculate_directory @@ -0,0 +1 @@ +# Calculate merge()!= append=skip diff --git a/profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch b/profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch new file mode 100644 index 000000000..6181c9037 --- /dev/null +++ b/profiles/templates/3.5/6_ac_install_patch/media-gfx/nomacs/libqpsd_fix.patch @@ -0,0 +1,77 @@ +# Calculate format=diff merge(media-gfx/nomacs)==3.8.0 +commit 92a95cd288dd64829e33aeb5d8c6e9725219e6bd +Author: Raphael Kubo da Costa +Date: Mon Jan 29 12:01:50 2018 +0100 + + cmake: Stop calling QT5_WRAP_CPP() when building quazip and libqpsd. + + cmake/Utils.cmake already sets CMAKE_AUTOMOC to on. + + Calling QT5_WRAP_CPP() used to be just redundant, as QUAZIP_MOC_SRC and + LIBQPSD_MOC_SRC were never actually added as source dependencies in + MacBuildTarget.cmake and UnixBuildTarget.cmake. In other words, CMake's own + automoc infrastructure was actually being used and the moc invocations from + QT5_WRAP_CPP() were not being made at all. + + Starting with Qt 5.9.4, calling QT5_WRAP_CPP() disables the AUTOMOC property + on the macro's input files, which means neither CMake's automoc + infrastructure not QT5_WRAP_CPP()'s code were being used and we ended up + with several 'undefined reference to vtable' errors when linking. + +diff --git a/ImageLounge/cmake/Mac.cmake b/ImageLounge/cmake/Mac.cmake +index 73c01430..14e9494d 100644 +--- a/ImageLounge/cmake/Mac.cmake ++++ b/ImageLounge/cmake/Mac.cmake +@@ -104,7 +104,6 @@ unset(QUAZIP_LIBRARIES CACHE) + + unset(QUAZIP_HEADERS CACHE) + unset(QUAZIP_SOURCES CACHE) +-unset(QUAZIP_MOCS CACHE) + unset(QT_ROOT CACHE) + + if(ENABLE_QUAZIP) +@@ -123,9 +122,7 @@ if(ENABLE_QUAZIP) + + file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/*.c" "3rdparty/quazip-0.7/quazip/*.cpp") + file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h") +- file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h") + +- QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS}) + add_definitions(-DWITH_QUAZIP) + endif(USE_SYSTEM_QUAZIP) + endif(ENABLE_QUAZIP) +@@ -134,5 +131,3 @@ endif(ENABLE_QUAZIP) + # add libqpsd + file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp") + file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h") +-file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h") +-QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS}) +diff --git a/ImageLounge/cmake/Unix.cmake b/ImageLounge/cmake/Unix.cmake +index 4cf2c0ec..5297d48c 100644 +--- a/ImageLounge/cmake/Unix.cmake ++++ b/ImageLounge/cmake/Unix.cmake +@@ -97,7 +97,6 @@ unset(QUAZIP_LIBRARIES CACHE) + + unset(QUAZIP_HEADERS CACHE) + unset(QUAZIP_SOURCES CACHE) +-unset(QUAZIP_MOCS CACHE) + unset(QT_ROOT CACHE) + + if(ENABLE_QUAZIP) +@@ -116,9 +115,7 @@ if(ENABLE_QUAZIP) + + file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/*.c" "3rdparty/quazip-0.7/quazip/*.cpp") + file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h") +- file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h") + +- QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS}) + add_definitions(-DWITH_QUAZIP) + endif(USE_SYSTEM_QUAZIP) + endif(ENABLE_QUAZIP) +@@ -132,6 +129,4 @@ IF(USE_SYSTEM_LIBQPSD) + ELSE() + file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp") + file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h") +- file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h") +- QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS}) + ENDIF(USE_SYSTEM_LIBQPSD)