diff options
Diffstat (limited to 'graphics/gmic-qt/files')
| -rw-r--r-- | graphics/gmic-qt/files/patch-CMakeLists.txt | 38 | ||||
| -rw-r--r-- | graphics/gmic-qt/files/patch-gmic_src_gmic.cpp | 10 |
2 files changed, 12 insertions, 36 deletions
diff --git a/graphics/gmic-qt/files/patch-CMakeLists.txt b/graphics/gmic-qt/files/patch-CMakeLists.txt index a3a46b6e43e0..e8f974239750 100644 --- a/graphics/gmic-qt/files/patch-CMakeLists.txt +++ b/graphics/gmic-qt/files/patch-CMakeLists.txt @@ -1,39 +1,15 @@ ---- CMakeLists.txt.orig 2018-08-27 14:56:34 UTC +--- CMakeLists.txt.orig 2021-07-21 06:15:34 UTC +++ CMakeLists.txt -@@ -232,6 +232,12 @@ if (WIN32) - ) +@@ -233,6 +233,12 @@ if(ENABLE_CURL) + endif() endif() -+find_package(Threads) ++find_package(Threads) +set(gmic_qt_LIBRARIES + ${gmic_qt_LIBRARIES} + Threads::Threads +) + - if (NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release") - endif() -@@ -427,10 +433,10 @@ qt5_wrap_ui(gmic_qt_SRCS - ui/zoomlevelselector.ui - ) - --# qt5_create_translation( --# qmic_qt_QM --# ${CMAKE_SOURCE_DIR}/translations --# ${gmic_qt_SRCS} -+qt5_create_translation( -+ qmic_qt_QM -+ ${CMAKE_SOURCE_DIR}/translations -+ ${gmic_qt_SRCS} - # translations/cs.ts - # translations/de.ts - # translations/es.ts -@@ -446,7 +452,7 @@ qt5_wrap_ui(gmic_qt_SRCS - # translations/zh.ts - # ) - --qt5_add_translation(gmic_qt_QM -+# qt5_add_translation(gmic_qt_QM - translations/cs.ts - translations/de.ts - translations/es.ts + add_definitions(-Dgmic_build) + add_definitions(-Dcimg_use_abort) + add_definitions(-Dgmic_is_parallel) diff --git a/graphics/gmic-qt/files/patch-gmic_src_gmic.cpp b/graphics/gmic-qt/files/patch-gmic_src_gmic.cpp index 04fea7b5a253..6163681b3ef8 100644 --- a/graphics/gmic-qt/files/patch-gmic_src_gmic.cpp +++ b/graphics/gmic-qt/files/patch-gmic_src_gmic.cpp @@ -1,6 +1,6 @@ ---- gmic/src/gmic.cpp.orig 2018-08-27 18:23:05 UTC +--- gmic/src/gmic.cpp.orig 2021-07-16 09:15:32 UTC +++ gmic/src/gmic.cpp -@@ -1993,7 +1993,7 @@ double gmic::mp_ext(char *const str, void *const p_lis +@@ -2443,7 +2443,7 @@ double gmic::mp_store(const Ts *const ptr, const unsig // Manage correspondence between abort pointers and thread ids. CImgList<void*> gmic::list_p_is_abort = CImgList<void*>(); bool *gmic::abort_ptr(bool *const p_is_abort) { @@ -9,9 +9,9 @@ void* tid = (void*)(cimg_ulong)getpid(); #elif cimg_OS==1 void* tid = (void*)(cimg_ulong)syscall(SYS_gettid); -@@ -2326,7 +2326,7 @@ gmic::~gmic() { - #endif // #if cimg_display!=0 - +@@ -2781,7 +2781,7 @@ gmic::~gmic() { + cimg::exception_mode(cimg_exception_mode); + cimg_forX(display_windows,l) delete &display_window(l); cimg::mutex(21); -#if defined(__MACOSX__) || defined(__APPLE__) +#if defined(__MACOSX__) || defined(__APPLE__) || defined(__FreeBSD__) |