diff options
| author | nia <nia@pkgsrc.org> | 2019-11-10 21:42:15 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2019-11-10 21:42:15 +0000 |
| commit | 0c2ac87408beabf96fe8b4986bad49b9c168aac9 (patch) | |
| tree | b6766f83b387eb39a85b65c8691d5ced5c3e0d83 /editors | |
| parent | d2a979edcf42819cda880c2b4ac99f5deeb37878 (diff) | |
| download | pkgsrc-0c2ac87408beabf96fe8b4986bad49b9c168aac9.tar.gz | |
xournalpp: Make x11 library dependencies explicit on all platforms.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/xournalpp/Makefile | 4 | ||||
| -rw-r--r-- | editors/xournalpp/distinfo | 4 | ||||
| -rw-r--r-- | editors/xournalpp/patches/patch-CMakeLists.txt | 13 |
3 files changed, 16 insertions, 5 deletions
diff --git a/editors/xournalpp/Makefile b/editors/xournalpp/Makefile index 20504119be8..ef28396fa7d 100644 --- a/editors/xournalpp/Makefile +++ b/editors/xournalpp/Makefile @@ -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]*:../../print/tex-standalone .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" diff --git a/editors/xournalpp/distinfo b/editors/xournalpp/distinfo index 76d6c05d1e3..3172d66ee83 100644 --- a/editors/xournalpp/distinfo +++ b/editors/xournalpp/distinfo @@ -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 diff --git a/editors/xournalpp/patches/patch-CMakeLists.txt b/editors/xournalpp/patches/patch-CMakeLists.txt index 109d509780a..62a661b83aa 100644 --- a/editors/xournalpp/patches/patch-CMakeLists.txt +++ b/editors/xournalpp/patches/patch-CMakeLists.txt @@ -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 () |