CVS commit: pkgsrc/editors/xournalpp

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Nov 10 21:42:15 UTC 2019

Modified Files:
        pkgsrc/editors/xournalpp: Makefile distinfo
        pkgsrc/editors/xournalpp/patches: patch-CMakeLists.txt

Log Message:
xournalpp: Make x11 library dependencies explicit on all platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/editors/xournalpp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/xournalpp/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/editors/xournalpp/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/editors/xournalpp/Makefile
diff -u pkgsrc/editors/xournalpp/Makefile:1.5 pkgsrc/editors/xournalpp/Makefile:1.6
--- pkgsrc/editors/xournalpp/Makefile:1.5       Thu Nov  7 12:38:05 2019
+++ pkgsrc/editors/xournalpp/Makefile   Sun Nov 10 21:42:15 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/11/07 12:38:05 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2019/11/10 21:42:15 nia Exp $
 
 DISTNAME=      xournalpp-1.0.15
 PKGREVISION=   3
@@ -34,4 +34,6 @@ DEPENDS+=     tex-standalone-[0-9]*:../../pr
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/xournalpp/distinfo
diff -u pkgsrc/editors/xournalpp/distinfo:1.2 pkgsrc/editors/xournalpp/distinfo:1.3
--- pkgsrc/editors/xournalpp/distinfo:1.2       Sat Nov  2 14:44:15 2019
+++ pkgsrc/editors/xournalpp/distinfo   Sun Nov 10 21:42:15 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2019/11/02 14:44:15 nia Exp $
+$NetBSD: distinfo,v 1.3 2019/11/10 21:42:15 nia Exp $
 
 SHA1 (xournalpp-1.0.15.tar.gz) = 6934c8de1260ca580988c421c55c2a44999a235c
 RMD160 (xournalpp-1.0.15.tar.gz) = 8f53fd4b74507e28e28a4fffa9fe4d8c5f434c45
 SHA512 (xournalpp-1.0.15.tar.gz) = 7a015c1d48e26eed313f994aa293f6d2ab711ac6970568edef4ba10dcf1551c87279daa2b361731ac58ef236e1dd59e0eebf41e4739fba9db954a718450d5b79
 Size (xournalpp-1.0.15.tar.gz) = 14938798 bytes
-SHA1 (patch-CMakeLists.txt) = 52b9a70a3242b618f8092b94a21c276c522e749d
+SHA1 (patch-CMakeLists.txt) = 3ead1546fe20e7481e93f2976c3e7b98c0a7699f
 SHA1 (patch-src_control_tools_StrokeHandler.cpp) = 80df57a9776a9919a95a04bf6c057dc021fc789e
 SHA1 (patch-src_util_DeviceListHelper.cpp) = 8f3534c80c79ec49dd9562c3ed4e3ff7c36b2ecb

Index: pkgsrc/editors/xournalpp/patches/patch-CMakeLists.txt
diff -u pkgsrc/editors/xournalpp/patches/patch-CMakeLists.txt:1.1 pkgsrc/editors/xournalpp/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/editors/xournalpp/patches/patch-CMakeLists.txt:1.1   Wed Oct 16 13:34:08 2019
+++ pkgsrc/editors/xournalpp/patches/patch-CMakeLists.txt       Sun Nov 10 21:42:15 2019
@@ -1,11 +1,20 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2019/10/16 13:34:08 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2019/11/10 21:42:15 nia Exp $
 
 Find pkgsrc lua with pkg-config.
 
-Unconditionally install desktop files.
+Unconditionally install desktop files and make dependencies explicit.
 
 --- CMakeLists.txt.orig        2019-10-15 17:47:34.000000000 +0000
 +++ CMakeLists.txt
+@@ -50,7 +50,7 @@ else ()
+ endif ()
+ 
+ ## For touch workaround, may need to be disabled for a Wayland Build
+-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
++if (TRUE)
+     set (xournalpp_LDFLAGS ${xournalpp_LDFLAGS} "-lX11 -lXi")
+ endif ()
+ 
 @@ -130,7 +130,7 @@ if (MacIntegration_FOUND)
  endif ()