pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

uTox-git: Reduce a patch partially merged upstream



Module Name:	pkgsrc-wip
Committed By:	Mateusz Poszwa <old4%o2.pl@localhost>
Pushed By:	f8l
Date:		Mon Feb 6 21:24:40 2017 +0100
Changeset:	4232c3c090295cc0719c3a03918514320c6711d9

Modified Files:
	uTox-git/distinfo
	uTox-git/patches/patch-src_xlib_CMakeLists.txt

Log Message:
uTox-git: Reduce a patch partially merged upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4232c3c090295cc0719c3a03918514320c6711d9

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

diffstat:
 uTox-git/distinfo                              |  2 +-
 uTox-git/patches/patch-src_xlib_CMakeLists.txt | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diffs:
diff --git a/uTox-git/distinfo b/uTox-git/distinfo
index 3753ae2fa1..bdd7651e35 100644
--- a/uTox-git/distinfo
+++ b/uTox-git/distinfo
@@ -2,7 +2,7 @@ $NetBSD$
 
 SHA1 (patch-src_main.h) = 1def46cb26e474b20a5e34ae5a471a7c9fbb004c
 SHA1 (patch-src_updater.c) = c02cec879f954d6c2abb3e1ea6b0e0a01b4e0b50
-SHA1 (patch-src_xlib_CMakeLists.txt) = 237e0413434908d2540c9ad95b0c31befc15ea62
+SHA1 (patch-src_xlib_CMakeLists.txt) = ae45b48127d1a8a712176b786aae6900d5ee5813
 SHA1 (patch-src_xlib_main.c) = f474254680c6da875e5e3454afcb07455f858bbf
 SHA1 (patch-src_xlib_v4l.c) = 8f8de28684886ea9a135820b21f3bb3a91ba87b9
 SHA1 (patch-src_xlib_video.c) = e8a036070322af80736fb7789de3a2dbdeb86d45
diff --git a/uTox-git/patches/patch-src_xlib_CMakeLists.txt b/uTox-git/patches/patch-src_xlib_CMakeLists.txt
index 7712fdb4bf..2fb72d7c5e 100644
--- a/uTox-git/patches/patch-src_xlib_CMakeLists.txt
+++ b/uTox-git/patches/patch-src_xlib_CMakeLists.txt
@@ -2,9 +2,9 @@ $NetBSD$
 
 Don’t link with dl on non-Linux
 
---- src/xlib/CMakeLists.txt.orig	2017-01-30 00:16:46.000000000 +0000
+--- src/xlib/CMakeLists.txt.orig	2017-02-06 18:58:47.000000000 +0000
 +++ src/xlib/CMakeLists.txt
-@@ -39,14 +39,20 @@ message("X library: ${X11_LIBRARIES}")
+@@ -39,7 +39,11 @@ message("X library: ${X11_LIBRARIES}")
  message("Xrender include: ${X11_Xrender_INCLUDE_PATH}")
  message("Xrender library: ${X11_Xrender_LIB}")
  
@@ -14,17 +14,6 @@ Don’t link with dl on non-Linux
 +if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 +  target_link_libraries(utoxNATIVE dl)
 +endif()
-+
-+include(GNUInstallDirs)
  
- install(FILES
-     ../utox.desktop
--    DESTINATION "share/applications"
-+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
-     )
+ include(GNUInstallDirs)
  
- install(FILES
-     ../utox.1
--    DESTINATION "share/man/man1"
-+    DESTINATION "${CMAKE_INSTALL_MANDIR}/man1"
-     )


Home | Main Index | Thread Index | Old Index