Thu Mar 16 07:15:48 2023 UTC ()
gmic: fix build on NetBSD-current

Uses libX11 directly, so link against it.


(wiz)
diff -r1.11 -r1.12 pkgsrc/graphics/gmic/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro
cvs diff -r1.11 -r1.12 pkgsrc/graphics/gmic/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/gmic/distinfo 2021/10/26 10:46:14 1.11
+++ pkgsrc/graphics/gmic/distinfo 2023/03/16 07:15:48 1.12
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.11 2021/10/26 10:46:14 nia Exp $ 1$NetBSD: distinfo,v 1.12 2023/03/16 07:15:48 wiz Exp $
2 2
3BLAKE2s (gmic_2.9.0.tar.gz) = 80b2dcb145ad70f9e7ea0c1824922f3524a9299cfeb5c1f3ec4135b7e76bd323 3BLAKE2s (gmic_2.9.0.tar.gz) = 80b2dcb145ad70f9e7ea0c1824922f3524a9299cfeb5c1f3ec4135b7e76bd323
4SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d 4SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
5Size (gmic_2.9.0.tar.gz) = 6195597 bytes 5Size (gmic_2.9.0.tar.gz) = 6195597 bytes
6SHA1 (patch-gmic-qt_gmic__qt.pro) = 9fb32f44c13f743a0d6624bd24a0dac331f677b5 6SHA1 (patch-gmic-qt_gmic__qt.pro) = 2c6bdf80a9b34cfbd07cbae962e17e6191ade007
7SHA1 (patch-src_Makefile) = 30327a1860885d93d8f0a59ff5d024b41ca1f836 7SHA1 (patch-src_Makefile) = 30327a1860885d93d8f0a59ff5d024b41ca1f836
8SHA1 (patch-src_gmic.cpp) = f74d2f444b9b8121fce5aa14e3266a88bf749da1 8SHA1 (patch-src_gmic.cpp) = f74d2f444b9b8121fce5aa14e3266a88bf749da1
cvs diff -r1.1 -r1.2 pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro (expand / switch to unified diff)

--- pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro 2020/05/26 11:28:04 1.1
+++ pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro 2023/03/16 07:15:48 1.2
@@ -1,17 +1,30 @@ @@ -1,17 +1,30 @@
1$NetBSD: patch-gmic-qt_gmic__qt.pro,v 1.1 2020/05/26 11:28:04 joerg Exp $ 1$NetBSD: patch-gmic-qt_gmic__qt.pro,v 1.2 2023/03/16 07:15:48 wiz Exp $
2 2
3--- gmic-qt/gmic_qt.pro.orig 2020-05-26 01:42:41.240133823 +0000 3Link against libX11 on everything except macOS which might not use X11.
 4
 5Stop using lto by default.
 6
 7--- gmic-qt/gmic_qt.pro.orig 2020-03-28 13:25:12.000000000 +0000
4+++ gmic-qt/gmic_qt.pro 8+++ gmic-qt/gmic_qt.pro
 9@@ -147,7 +147,7 @@ win32 {
 10 DEFINES += cimg_display=2
 11 }
 12
 13-linux {
 14+!macx {
 15 DEFINES += _IS_LINUX_
 16 PKGCONFIG += x11
 17 message( Linux platform )
5@@ -227,12 +227,6 @@ win32:equals(LTO,"on") { 18@@ -227,12 +227,6 @@ win32:equals(LTO,"on") {
6 LTO = off 19 LTO = off
7 } 20 }
8  21
9-!win32:CONFIG(release, debug|release):gcc|clang:equals(LTO,"on") { 22-!win32:CONFIG(release, debug|release):gcc|clang:equals(LTO,"on") {
10- message("Link Time Optimizer enabled") 23- message("Link Time Optimizer enabled")
11- QMAKE_CXXFLAGS_RELEASE += -flto 24- QMAKE_CXXFLAGS_RELEASE += -flto
12- QMAKE_LFLAGS_RELEASE += -flto 25- QMAKE_LFLAGS_RELEASE += -flto
13-} 26-}
14- 27-
15 DEFINES += gmic_gui gmic_build gmic_is_parallel cimg_use_abort 28 DEFINES += gmic_gui gmic_build gmic_is_parallel cimg_use_abort
16  29
17 INCLUDEPATH += $$PWD $$PWD/src $$GMIC_PATH 30 INCLUDEPATH += $$PWD $$PWD/src $$GMIC_PATH