77 lines
3.4 KiB
Diff
77 lines
3.4 KiB
Diff
Index: graphics/krita-gmic-plugin/Makefile
|
|
===================================================================
|
|
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/Makefile,v
|
|
retrieving revision 1.3
|
|
diff -u -p -u -p -r1.3 Makefile
|
|
--- graphics/krita-gmic-plugin/Makefile 6 May 2022 05:35:23 -0000 1.3
|
|
+++ graphics/krita-gmic-plugin/Makefile 26 May 2022 20:36:54 -0000
|
|
@@ -1,6 +1,6 @@
|
|
COMMENT = krita gmic plugin
|
|
|
|
-V = 3.0.2.2
|
|
+V = 3.1.2.1
|
|
DISTNAME = krita-gmic-plugin-${V}
|
|
|
|
CATEGORIES = graphics
|
|
Index: graphics/krita-gmic-plugin/distinfo
|
|
===================================================================
|
|
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/distinfo,v
|
|
retrieving revision 1.3
|
|
diff -u -p -u -p -r1.3 distinfo
|
|
--- graphics/krita-gmic-plugin/distinfo 6 May 2022 05:35:23 -0000 1.3
|
|
+++ graphics/krita-gmic-plugin/distinfo 26 May 2022 20:37:03 -0000
|
|
@@ -1,2 +1,2 @@
|
|
-SHA256 (gmic-3.0.2.2-patched.tar.gz) = EX8EaehpcnH4gIMY2SgBPcUDb+fca+GAqjB1e2VESq4=
|
|
-SIZE (gmic-3.0.2.2-patched.tar.gz) = 10452771
|
|
+SHA256 (gmic-3.1.2.1-patched.tar.gz) = V4HLiPutQ1MSPg4d8ifz212p6h7GcAA1xe/j9OQpIIs=
|
|
+SIZE (gmic-3.1.2.1-patched.tar.gz) = 10687680
|
|
Index: graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt
|
|
===================================================================
|
|
RCS file: graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt
|
|
diff -N graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt
|
|
--- /dev/null 1 Jan 1970 00:00:00 -0000
|
|
+++ graphics/krita-gmic-plugin/patches/patch-gmic-qt_CMakeLists_txt 29 May 2022 05:58:31 -0000
|
|
@@ -0,0 +1,17 @@
|
|
+We don't support --stack
|
|
+Index: gmic-qt/CMakeLists.txt
|
|
+--- gmic-qt/CMakeLists.txt.orig
|
|
++++ gmic-qt/CMakeLists.txt
|
|
+@@ -272,9 +272,9 @@ if (MSVC)
|
|
+ add_link_options(/GUARD:CF)
|
|
+ endif()
|
|
+ else()
|
|
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--stack,16777216")
|
|
+- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--stack,16777216")
|
|
+- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--stack,16777216")
|
|
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl")
|
|
++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl")
|
|
++ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl")
|
|
+ endif()
|
|
+
|
|
+ #
|
|
Index: graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp
|
|
===================================================================
|
|
RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp,v
|
|
retrieving revision 1.1.1.1
|
|
diff -u -p -u -p -r1.1.1.1 patch-src_gmic_cpp
|
|
--- graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp 26 Mar 2022 20:33:50 -0000 1.1.1.1
|
|
+++ graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp 29 May 2022 05:58:18 -0000
|
|
@@ -1,7 +1,7 @@
|
|
Index: src/gmic.cpp
|
|
--- src/gmic.cpp.orig
|
|
+++ src/gmic.cpp
|
|
-@@ -2473,6 +2473,8 @@ CImgList<void*> gmic::list_p_is_abort = CImgList<void*
|
|
+@@ -2518,6 +2518,8 @@ CImgList<void*> gmic::list_p_is_abort = CImgList<void*
|
|
bool *gmic::abort_ptr(bool *const p_is_abort) {
|
|
#if defined(__MACOSX__) || defined(__APPLE__)
|
|
void* tid = (void*)(cimg_ulong)getpid();
|
|
@@ -10,7 +10,7 @@ Index: src/gmic.cpp
|
|
#elif cimg_OS==1
|
|
void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
|
|
#elif cimg_OS==2
|
|
-@@ -2815,6 +2817,8 @@ gmic::~gmic() {
|
|
+@@ -2860,6 +2862,8 @@ gmic::~gmic() {
|
|
cimg::mutex(21);
|
|
#if defined(__MACOSX__) || defined(__APPLE__)
|
|
void* tid = (void*)(cimg_ulong)getpid();
|