diff options
author | Ismael Luceno | 2017-02-16 18:18:57 -0200 |
---|---|---|
committer | Ismael Luceno | 2017-02-16 19:19:09 -0200 |
commit | 5ca691bea3d0ce612cca6697f690c256207ba0c8 (patch) | |
tree | d644bf4c0f8f2ea4edd6af15a9bbd13606152a76 | |
parent | 131bb89a9fea3134e023ce47d3f7829b6f5207cd (diff) |
utox: Remove installation rules patch, merged by upstream
-rw-r--r-- | chat-im/utox/HISTORY | 4 | ||||
-rw-r--r-- | chat-im/utox/patches/0001-Fix-utox-target-installation-rule.patch | 38 |
2 files changed, 4 insertions, 38 deletions
diff --git a/chat-im/utox/HISTORY b/chat-im/utox/HISTORY index 078e7dafb1..84b1805ad6 100644 --- a/chat-im/utox/HISTORY +++ b/chat-im/utox/HISTORY @@ -1,3 +1,7 @@ +2017-02-16 Ismael Luceno <ismael@sourcemage.org> + * patches/0001-Fix-utox-target-installation-rule.patch: Removed, merged + by upsream + 2016-11-23 Ismael Luceno <ismael@sourcemage.org> * BUILD, DEPENDS, DETAILS, PREPARE, PRE_BUILD, patches/0001-Fix-utox-target-installation-rule.patch: spell created diff --git a/chat-im/utox/patches/0001-Fix-utox-target-installation-rule.patch b/chat-im/utox/patches/0001-Fix-utox-target-installation-rule.patch deleted file mode 100644 index 20b56dde6d..0000000000 --- a/chat-im/utox/patches/0001-Fix-utox-target-installation-rule.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 01e97f0b9df9e6a1ad6a0a0320f7087c7b2a94e8 Mon Sep 17 00:00:00 2001 -From: Ismael Luceno <ismael@iodev.co.uk> -Date: Sat, 26 Nov 2016 05:23:46 -0200 -Subject: [PATCH] Fix utox target installation rule - -CMake install rules for files generated by the build process must specify -they reference a target to be correctly looked up in the build directory, -instead of the source directory. - -Signed-off-by: Ismael Luceno <ismael@iodev.co.uk> ---- - CMakeLists.txt | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 98824775c76d..380fa684f219 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -144,9 +144,6 @@ elseif(UNIX) # xlib by default - target_link_libraries(utoxNATIVE icon v4lconvert X11 Xext Xrender fontconfig freetype resolv dl ) - - install(FILES -- utox -- DESTINATION "bin") -- install(FILES - src/utox.desktop - DESTINATION "share/applications") - install(FILES -@@ -270,3 +267,6 @@ target_link_libraries(utox - sodium pthread m vpx ) - - set_property(TARGET utox PROPERTY C_STANDARD 99) -+if(UNIX) -+ install(TARGETS utox RUNTIME DESTINATION "bin") -+endif() --- -2.10.2 - |