CVS commit: pkgsrc/graphics/gmic

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Mar 16 07:15:48 UTC 2023

Modified Files:
        pkgsrc/graphics/gmic: distinfo
        pkgsrc/graphics/gmic/patches: patch-gmic-qt_gmic__qt.pro

Log Message:
gmic: fix build on NetBSD-current

Uses libX11 directly, so link against it.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/gmic/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/gmic/distinfo
diff -u pkgsrc/graphics/gmic/distinfo:1.11 pkgsrc/graphics/gmic/distinfo:1.12
--- pkgsrc/graphics/gmic/distinfo:1.11  Tue Oct 26 10:46:14 2021
+++ pkgsrc/graphics/gmic/distinfo       Thu Mar 16 07:15:48 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:46:14 nia Exp $
+$NetBSD: distinfo,v 1.12 2023/03/16 07:15:48 wiz Exp $
 
 BLAKE2s (gmic_2.9.0.tar.gz) = 80b2dcb145ad70f9e7ea0c1824922f3524a9299cfeb5c1f3ec4135b7e76bd323
 SHA512 (gmic_2.9.0.tar.gz) = 3b3703520998e5ad547316683158d7b60541a8cea2a7c1e7118f8de88492e0961bf1fe1da360dfb26d0ba7eaf997e7005a864364297db2bb405d532dedc4241d
 Size (gmic_2.9.0.tar.gz) = 6195597 bytes
-SHA1 (patch-gmic-qt_gmic__qt.pro) = 9fb32f44c13f743a0d6624bd24a0dac331f677b5
+SHA1 (patch-gmic-qt_gmic__qt.pro) = 2c6bdf80a9b34cfbd07cbae962e17e6191ade007
 SHA1 (patch-src_Makefile) = 30327a1860885d93d8f0a59ff5d024b41ca1f836
 SHA1 (patch-src_gmic.cpp) = f74d2f444b9b8121fce5aa14e3266a88bf749da1

Index: pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro
diff -u pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro:1.1 pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro:1.2
--- pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro:1.1 Tue May 26 11:28:04 2020
+++ pkgsrc/graphics/gmic/patches/patch-gmic-qt_gmic__qt.pro     Thu Mar 16 07:15:48 2023
@@ -1,7 +1,20 @@
-$NetBSD: patch-gmic-qt_gmic__qt.pro,v 1.1 2020/05/26 11:28:04 joerg Exp $
+$NetBSD: patch-gmic-qt_gmic__qt.pro,v 1.2 2023/03/16 07:15:48 wiz Exp $
 
---- gmic-qt/gmic_qt.pro.orig   2020-05-26 01:42:41.240133823 +0000
+Link against libX11 on everything except macOS which might not use X11.
+
+Stop using lto by default.
+
+--- gmic-qt/gmic_qt.pro.orig   2020-03-28 13:25:12.000000000 +0000
 +++ gmic-qt/gmic_qt.pro
+@@ -147,7 +147,7 @@ win32 {
+  DEFINES += cimg_display=2
+ }
+ 
+-linux {
++!macx {
+   DEFINES += _IS_LINUX_
+   PKGCONFIG += x11
+   message( Linux platform )
 @@ -227,12 +227,6 @@ win32:equals(LTO,"on") {
      LTO = off
  }