git: ae1fa233bc56 - main - graphics/gmic-qt: update to 2.9.8
Tobias C. Berner
tcberner at FreeBSD.org
Wed Jul 21 07:31:09 UTC 2021
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=ae1fa233bc568a939c326256ea4d533cf878a800
commit ae1fa233bc568a939c326256ea4d533cf878a800
Author: Tobias C. Berner <tcberner at FreeBSD.org>
AuthorDate: 2021-07-21 07:30:05 +0000
Commit: Tobias C. Berner <tcberner at FreeBSD.org>
CommitDate: 2021-07-21 07:30:48 +0000
graphics/gmic-qt: update to 2.9.8
---
graphics/gmic-qt/Makefile | 6 +---
graphics/gmic-qt/distinfo | 22 +++++++--------
graphics/gmic-qt/files/patch-CMakeLists.txt | 38 +++++---------------------
graphics/gmic-qt/files/patch-gmic_src_gmic.cpp | 10 +++----
4 files changed, 24 insertions(+), 52 deletions(-)
diff --git a/graphics/gmic-qt/Makefile b/graphics/gmic-qt/Makefile
index 9f553e2502ac..b5a2858d8ef1 100644
--- a/graphics/gmic-qt/Makefile
+++ b/graphics/gmic-qt/Makefile
@@ -1,7 +1,6 @@
PORTNAME= gmic-qt
DISTVERSIONPREFIX= v.
-DISTVERSION= 2.3.6
-PORTREVISION= 5
+DISTVERSION= 2.9.8
PORTEPOCH= 1
CATEGORIES= graphics kde
MASTER_SITES= http://gmic.eu/:stdlib \
@@ -10,9 +9,6 @@ DISTFILES= gmic_stdlib${DISTVERSION:S/.//g}.h:stdlib
DIST_SUBDIR= KDE/${PORTNAME}/${PORTVERSION}
EXTRACT_ONLY= ${DISTNAME}.tar.gz ${DISTFILE_gmic} ${DISTFILE_cimg}
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES= 64cdd2cdd416ec43171753eddf55a7b3fda0d33b.patch:-p1 # Remove translation files install directive
-
MAINTAINER= kde at FreeBSD.org
COMMENT= Versatile Qt front-end to GMIC
diff --git a/graphics/gmic-qt/distinfo b/graphics/gmic-qt/distinfo
index 0ce99db9f67e..44a9b160245f 100644
--- a/graphics/gmic-qt/distinfo
+++ b/graphics/gmic-qt/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1600079781
-SHA256 (KDE/gmic-qt/2.3.6/gmic_stdlib236.h) = 98a8bfb0e877b32c017b820e5d0ad8382df79ece3d298db1687e25abdb41af60
-SIZE (KDE/gmic-qt/2.3.6/gmic_stdlib236.h) = 1882725
-SHA256 (KDE/gmic-qt/2.3.6/c-koi-gmic-qt-v.2.3.6_GH0.tar.gz) = 51bc054ea9029bd79a3ba1919b535ec9135fe2013b77a73bf92ccd7a07ae9179
-SIZE (KDE/gmic-qt/2.3.6/c-koi-gmic-qt-v.2.3.6_GH0.tar.gz) = 538479
-SHA256 (KDE/gmic-qt/2.3.6/dtschump-gmic-v.2.3.6_GH0.tar.gz) = 2a9e0859f4d6900b22b00a82a396dd0b344cae4cda2d18ee9cd1566e952216f3
-SIZE (KDE/gmic-qt/2.3.6/dtschump-gmic-v.2.3.6_GH0.tar.gz) = 39078483
-SHA256 (KDE/gmic-qt/2.3.6/dtschump-CImg-v.2.3.6_GH0.tar.gz) = a3844afda0c701dbf77505f3f8ec6eea4599d3c6485794a5dbf3545444ec8234
-SIZE (KDE/gmic-qt/2.3.6/dtschump-CImg-v.2.3.6_GH0.tar.gz) = 11036209
-SHA256 (KDE/gmic-qt/2.3.6/64cdd2cdd416ec43171753eddf55a7b3fda0d33b.patch) = 656494c72f5a2b380a637070eacc1924bc372db5bd0ab25892a835a941ed389e
-SIZE (KDE/gmic-qt/2.3.6/64cdd2cdd416ec43171753eddf55a7b3fda0d33b.patch) = 692
+TIMESTAMP = 1626846718
+SHA256 (KDE/gmic-qt/2.9.8/gmic_stdlib298.h) = 733cbf91bccffc3b309125cb2bd95abc4bf2ba28afafa2e1bd31c567357808c0
+SIZE (KDE/gmic-qt/2.9.8/gmic_stdlib298.h) = 2663736
+SHA256 (KDE/gmic-qt/2.9.8/c-koi-gmic-qt-v.2.9.8_GH0.tar.gz) = ba7d2dcc6463456f492b85b4ea14794bf080f423c57ff022567611daa47095a6
+SIZE (KDE/gmic-qt/2.9.8/c-koi-gmic-qt-v.2.9.8_GH0.tar.gz) = 1391496
+SHA256 (KDE/gmic-qt/2.9.8/dtschump-gmic-v.2.9.8_GH0.tar.gz) = f45c254f39c076e3f58adddff7a25c24bf85aad7a0b8e410b961f39ee17ce5d9
+SIZE (KDE/gmic-qt/2.9.8/dtschump-gmic-v.2.9.8_GH0.tar.gz) = 104274071
+SHA256 (KDE/gmic-qt/2.9.8/dtschump-CImg-v.2.9.8_GH0.tar.gz) = 0fac49fca534fd5e1c116da538a49fb2be52fb01f61101f87d35b8fa52a81290
+SIZE (KDE/gmic-qt/2.9.8/dtschump-CImg-v.2.9.8_GH0.tar.gz) = 11271978
+SHA256 (KDE/gmic-qt/2.9.8/64cdd2cdd416ec43171753eddf55a7b3fda0d33b.patch) = 656494c72f5a2b380a637070eacc1924bc372db5bd0ab25892a835a941ed389e
+SIZE (KDE/gmic-qt/2.9.8/64cdd2cdd416ec43171753eddf55a7b3fda0d33b.patch) = 692
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__)
More information about the dev-commits-ports-all
mailing list