Backport cmake-3.1 patch to earlier ebuilds, bug 538278. Thanks to Mark R. Pariente.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog
index fcd3c3d9fdce8cb8b6c934b00b70c73966b997d8..abdfeaf777d010c4faa5f7667dde465ebe07248d 100644 (file)
--- a/net-misc/freerdp/ChangeLog
+++ b/net-misc/freerdp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/freerdp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.83 2015/01/29 21:48:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.84 2015/01/30 19:46:16 floppym Exp $
+
+  30 Jan 2015; Mike Gilbert <floppym@gentoo.org>
+  +files/freerdp-1.1-cmake-3.1.patch, freerdp-1.1.0_beta1_p20130710-r1.ebuild,
+  freerdp-1.1.0_beta1_p20130710-r2.ebuild:
+  Backport cmake-3.1 patch to earlier ebuilds, bug 538278. Thanks to Mark R.
+  Pariente.
 
   29 Jan 2015; Mike Gilbert <floppym@gentoo.org>
   freerdp-1.1.0_beta1_p20130710-r1.ebuild,

diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 9b0f077f9723607c45a28b67cd26258553c6d5d7..f065993b34161fb51f62cf9486191d4948500274 100644 (file)
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX freerdp-1.1-CVE-2014-0250.patch 12976 SHA256 ea10fd71a81596b990c84771a5475de4abbda954af62d7a73d6cee38e9c05b0d SHA512 87f719670701100419483027982c045f39e2d0d0f39c58907ff508ca5a40cb01e18f9411854d3b947c9d07f5ecf32ddd6124484900801f1402396b2c847f2d71 WHIRLPOOL aef1e9233229db9437cd9817041f5a753177c25b4005b37519a66097f16b0addb64f2466d2e56595c934596f3f3fd6de6f5033109b9c234bfac9f517879f36e5
+AUX freerdp-1.1-cmake-3.1.patch 2729 SHA256 ba22b2fcc1575926c55e0dfe1d4d9b793e203c35df265f0fa353b3498c7315c5 SHA512 bf8ac5f30a3340dedc8cc664bb0fe11156dc521d2b70fdd0b1fe2e1f8f45c4419705d5e284fcfd4bccec03ddb9ffd8f571645c0bd312fd8e62e4819c43f3d8da WHIRLPOOL 684755aa9d147a8f8aa841e5ca892651dc05493cce32e886f2207c8575430f969242ea4c25ccf4f57dda8f86c5fa7de1363f3f220725b540fc7cc5202dfc9cac
 AUX freerdp-1.1.0_beta1-avx.patch 1424 SHA256 6de8e333ae1b7defbfcd6af1189e33e6478ca52b80c06bb013555413470d31ef SHA512 dd3d0c07d23c112f4405e3cf249137cc14fff8d2ba63e7c45740ca4c1dcd17fe258e434f3c62dad772de55aa3b59d58ac1447cef81c19c4edf843e467d7ab147 WHIRLPOOL 1877a69a89f1c69b59c4bccb5d82dc0300941cfcc8f1816bd2f88fcf0dac5d3307292c46c22e5bfac031dc4a9bcc35cea6b198dd546353480730967ca5c4fb4a
 AUX freerdp-1.1.0_beta1_p20130710-cmake.patch 756 SHA256 1a3b20a0f4635be1d1805d2d8c33ab853cc108e3fb4d4896cece08d20c05d4a9 SHA512 c1fb1df37612adf7e60fabee055c07aea00d30665e4b3c771bc2511d5098b4e74179a58ede84935002bbe885ae03c5a6617fcbc909a75f27910808102f9c123d WHIRLPOOL f8f6a15e65023bf758287c504a1ac7b1e82c1630980f0fc07b1272d8f6eea1a93ba52a9598a0366428b5a364062ed737974d5e4254507d70e651b56e2e39c78d
 AUX freerdp-1.1.0_beta1_p20130710-ffmpeg.patch 4241 SHA256 8dbd70eb3c7fffb617cfd27b1dc58e71d70014b2720016d3f4f022638ad65ebd SHA512 f55c1ad33d947ba26b9222fa8ce600bbb13d91b136a04526d4118e2018be016ef4ce2fac35a5563c9b4100870ec784568e9f7509e2667d1c01d5a4ce72169819 WHIRLPOOL 2fe3ffa36c9491b55b7e0113f37bb1f6a2ba91e1b08ef2083b75d3e59dbf6ffc122b485408252945996bdf0353a656929a439aafbbb3b2509fd6bf629bc4ad5d
@@ -9,16 +10,16 @@ AUX freerdp-1.1.0_beta1_p20130710-uclibc.patch 1921 SHA256 bd740b6c39200edd6979b
 AUX freerdp-cmake-3.1.patch 4047 SHA256 9a8257a6b08e302f093d075401cfd2e9a6c62bf10002f5aac3d9d0909d64c9d8 SHA512 523cbf5c298da61226cd666181b6d75ebe5303d87b9ed8b13ee724c5f4e88353e43fa013105866e440147b82c8286b6c959935f9f264f4a591e6ffa0f7bd25ca WHIRLPOOL fa6a5c76fa2b1e668154f1d80f4d8fb73cc110fc36dca0f709b0675e3734cd8ec04c3c3c8928ffcd328884bd35fff7a879675f36a5cff04db50025fd68ff9929
 DIST freerdp-1.1.0_beta1_p20130710.tar.gz 6682149 SHA256 0d0d2eec7e78b61458415ee98ad54379b31e9fc269b8bacf3e939bd048ac5e61 SHA512 89ec08acff5c9bbafe107cd079005146b6c4447fbe3172d8f774a20ab6b5e1f24abdeab2d7cb0d7694251aaea2924b0a10f1c0b4b660994cdfa51e8428b90440 WHIRLPOOL 2f7c04bde54293fc8fc85ba03baf7dc64e5da4cecdc87aaaa2ff316127abc43f0b56d70e14652f97f2e97a8f43bee8880837a94230448397dfad5f4ddbd055b1
 DIST freerdp-1.2.0_beta1_pre20141115.tar.gz 6096004 SHA256 a9dcd76946878cecddafc79a14794e7f57cb32397b5bc45af9d866d8d76bb421 SHA512 8fdbfba86df2cbb6c980e940df66bf30cd8d06e66df18656e18a120eabdd2b17e78c7612f1349589fcd8d3b37066b3956e0ef977d069f2abde653b4824fee61b WHIRLPOOL 0c0bb6c2a9e0b0efd072d0c46ded4790b69df649fe1e18bd907458e238a8149314ca47e5166523044c14a520e8f1d0d5b910e294c4ee670c1562c7980036cbb0
-EBUILD freerdp-1.1.0_beta1_p20130710-r1.ebuild 2654 SHA256 77de0acbd2c4ad01efa1420b2d15502c06d964f65f48d4020547ac6ec590252c SHA512 6a9add1cdcca119342d897e315ec76faa99fca0908f21c181036fb6ae03ea14507ec93763634658a8fbf42071fc9791107a89d123047dd3c0dcb6a9ca351c02c WHIRLPOOL e2174557a5eccff6255f9035c3e0841cfbfb58f2476a181072a64a9e0de9d48735b3ac4d520f1d37516b4d2d6608cb1ef5c444d3fbb16db140833a49f87b0b4d
-EBUILD freerdp-1.1.0_beta1_p20130710-r2.ebuild 2841 SHA256 90c8a0c7fb1987d51bdd34419b4b014dfd70877c6c2f6fa9d896da2458d77f9e SHA512 9c556553459a31eff1d73ed94045e4af63c450652c1e188332de0059ec659007999ddeac6eb52179f9964cee3dace6de1299698411320da51f9f03070e88c563 WHIRLPOOL 0b2efa9cf314e365a059900071c0ed87e6119d12f156456e9553e0d6a2a727721454d9e576a98fdb9c98d30455f4a44c1b5722c71b0fc2deb347aa7379cba1ad
+EBUILD freerdp-1.1.0_beta1_p20130710-r1.ebuild 2698 SHA256 bea917063a4505617ddae569378d69a4e9bae71812a50c5cc404ab2ec43dff0e SHA512 507086a05f4b34f9e26483d7e205f6b1abd07a369fc9b40a7208ee6745a9cc1b67a136054608854e044ad7cdfde8b84f0e362a9c825e619f70d17e33a71fb3dd WHIRLPOOL ba71596cd4b11f4b1574f84179b2827c30c0b1d97d9f0eec1efb199501e4ec033410feac90807729ece4949cd8c531f6f033cf348a857554b3e9d8f3fb3dd9a5
+EBUILD freerdp-1.1.0_beta1_p20130710-r2.ebuild 2884 SHA256 454ff91f2b41c778af5d72284a453e403797f1be00fc5bcd8c7176ed3b91b57d SHA512 232fa732d6b194858dc1a04dbf3b9f48bc0a97a725609f73a04a78fbaa52bc017c53f4a999e741b53f38c80fd69c67dfe05b331a427342ba9ad7a394f2d4d387 WHIRLPOOL b3cefae8a546ae464c2675493c9c87781b1b60b5dc2756cbff03de8783198da0626fdecefb99ba387545739f8136c14c93003816671eaf0a0721e6cd4d144082
 EBUILD freerdp-1.2.0_beta1_pre20141115.ebuild 2711 SHA256 a049203055f1206548ee35cd40395aa0999b4c7c6d7529f60072e9b92fac29ae SHA512 dd61cdf5ece8d4e2676c9ac47475915934012da01282b3543dc988350fea2320e44e3773b7708e8bd1bdb6bcff6a935ff1c98c81ae7f5fe31c823ad7f06f2f03 WHIRLPOOL 8c22e2e415cd6d5c966f0f1ebbb3ab36b13f6a1db97d5d32f71d3f689b7fe5ec15654676d41a4e52871956b2602ce4471eb582efe328cd9bdebfc36ce6b4c6e3
 EBUILD freerdp-9999.1.ebuild 2645 SHA256 1a9e5f05d0aaea4a588be2a1bd5912cdc323bf5b8ea79dae978a4dca59ecce7b SHA512 11f39286cb0eff1504135e62277a5c0340037a0aa18fd22a1a0e4f945e2bad71ab90dbc7e4a39075d8dd14d98cf4c9e804215f09541fc159a07849ab0035af8f WHIRLPOOL 99d265a5fef036155c7719a31a58ec299639b1d4a53a1997f7432334c48fe5dd792daf73274a7ab914e88c3cbcb71e8bd5730828f81556a2a649b7ec9d8691a6
-MISC ChangeLog 13380 SHA256 c490fb8ec0b26e42a2d1e9e043fc4b1a9b48d359ec2dc7698dbd9780072ad875 SHA512 b91eb45d41e4a5200df28d8060cc60bf1fccb2f24bee96bc620e814ce21ac358ccbfeeffda4f13c742597fa06e500f2bcbbb0437ebbb4ed3675d29330225b53a WHIRLPOOL 2ea453aa4f0c09a055d00852a045819c8f122a0abb9c3638b9e6a1548381a41c8de1c89ea826f6b347665e1a002c8746eb2d8e690ea98f17712fc216380dc8f3
+MISC ChangeLog 13641 SHA256 7952e4369f4c53b535675284d529f97a018a613cbc551f3e60475d115abcc111 SHA512 bc567d29a6383d481b3f4f90f1a8451b1dd4cfbd6bed5ed197826f745363b22ee9be7c91ca7dc16d4a52b6b2074e5e06b13ee8a02f0df67cf01639312ec15ef8 WHIRLPOOL 90aab4492917bf126a7e4ab45391915e952bfcc118da95719a4dbf34399687fa23456d24d5d635e43a3a8c2df731aaf46bad5141fca7bb0b2a2b8458f54766be
 MISC metadata.xml 424 SHA256 677d4fb3c378ea8ee9c4e340b7b32cf57a9f4fe9b92edddb42ddd39448f73f01 SHA512 4f1bb050f9b9889422c2e86b87dd43246b41cf45c1ce4e6c05e1c477c4a3031c20820edfd648cbc4ba2b61d2bae40883fcd5676246a0bc3fe767f5713701cf54 WHIRLPOOL d3ad68eadaf540d6200dc6a15ee3fe3597f80a64c1d2f8b7d22b23fb137422fda2edca1a8438800b31cd5d5dfd74dca23f611ad433b812f8bfe1ac0f1aa85b11
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlTKqrMACgkQC77qH+pIQ6SKIAEAjbGivmIiiDXdrA6EyAYqg8tX
-GL8POkHgRCVE+xqcKD0A/RW8+Uvow0391q9VK/zo9RgJrcUOSdrEEa8qCT+bVUI3
-=i2qN
+iF4EAREIAAYFAlTL34kACgkQC77qH+pIQ6QELwD+KjJ+yaxowsZ8aB58bphpJjMI
+hfkXycj3wwQn8E96YI8A/2+mDsw//i+7TPNrHUKqGCxgqN2X870A3NW/eg/Cm5Sz
+=UWas
 -----END PGP SIGNATURE-----

diff --git a/net-misc/freerdp/files/freerdp-1.1-cmake-3.1.patch b/net-misc/freerdp/files/freerdp-1.1-cmake-3.1.patch
new file mode 100644 (file)
index 0000000..aedfeb0
--- /dev/null
+++ b/net-misc/freerdp/files/freerdp-1.1-cmake-3.1.patch
@@ -0,0 +1,68 @@
+From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001
+From: Bernhard Miklautz <bernhard.miklautz@shacknet.at>
+Date: Fri, 12 Dec 2014 18:26:45 +0100
+Subject: [PATCH] build: cmake 3.1 compatibility
+
+* fix problem with REMOVE_DUPLICATES on undefined lists
+* since 3.1 file(GLOB FILEPATHS RELATIVE .. returns single / instead of // as
+  previously - necessary adoptions for regex and matches done. Should
+       work with all cmake versions.
+
+Tested with 3.1.0-rc3
+---
+ channels/CMakeLists.txt        | 4 ++--
+ channels/client/CMakeLists.txt | 2 ++
+ client/CMakeLists.txt          | 4 ++--
+ server/CMakeLists.txt          | 4 ++--
+ third-party/CMakeLists.txt     | 6 +++---
+ 5 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/channels/CMakeLists.txt b/channels/CMakeLists.txt
+index c4e6048..540b1ac 100644
+--- a/channels/CMakeLists.txt
++++ b/channels/CMakeLists.txt
+@@ -253,8 +253,8 @@ set(FILENAME "ChannelOptions.cmake")
+ file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
+ 
+ foreach(FILEPATH ${FILEPATHS})
+-      if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}")
+-              string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" DIR ${FILEPATH})
++      if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
++              string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" DIR ${FILEPATH})
+               set(CHANNEL_OPTION)
+               include(${FILEPATH})
+               if(${CHANNEL_OPTION})
+diff --git a/channels/client/CMakeLists.txt b/channels/client/CMakeLists.txt
+index 049bc7b..2db18e8 100644
+--- a/channels/client/CMakeLists.txt
++++ b/channels/client/CMakeLists.txt
+@@ -24,7 +24,9 @@ set(${MODULE_PREFIX}_SRCS
+       ${CMAKE_CURRENT_SOURCE_DIR}/addin.c
+       ${CMAKE_CURRENT_SOURCE_DIR}/addin.h)
+ 
++if(CHANNEL_STATIC_CLIENT_ENTRIES)
+ list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)
++endif()
+ 
+ foreach(STATIC_ENTRY ${CHANNEL_STATIC_CLIENT_ENTRIES})
+       foreach(STATIC_MODULE ${CHANNEL_STATIC_CLIENT_MODULES})
+diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
+index 09b1fd4..610f35e 100644
+--- a/third-party/CMakeLists.txt
++++ b/third-party/CMakeLists.txt
+@@ -22,11 +22,11 @@
+ file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
+ 
+ foreach(dir ${all_valid_subdirs})
+-      if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
+-              string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
++      if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
++              string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
+               message(STATUS "Adding third-party component ${dir_trimmed}")
+               add_subdirectory(${dir_trimmed})
+       endif()
+ endforeach(dir)
+ 
+-set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)
+\ No newline at end of file
++set(THIRD_PARTY_INCLUDES ${THIRD_PARTY_INCLUDES} PARENT_SCOPE)

diff --git a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r1.ebuild b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r1.ebuild
index 366c8a74dc474cfa5a16ca004f98db8419612018..74f32399916a997f875d92c61bd4f4af50b42008 100644 (file)
--- a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r1.ebuild
+++ b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r1.ebuild,v 1.9 2015/01/29 21:48:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r1.ebuild,v 1.10 2015/01/30 19:46:16 floppym Exp $
 
 EAPI="5"
 
@@ -77,6 +77,7 @@ DOCS=( README )
 PATCHES=(
        "${FILESDIR}/${P}-ffmpeg.patch"
        "${FILESDIR}/${PN}-1.1-CVE-2014-0250.patch"
+       "${FILESDIR}/freerdp-1.1-cmake-3.1.patch"
 )
 
 src_configure() {

diff --git a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild
index 7c1cfb25e584f58eba6d5ed7fe0c9859a669adc1..d71490db3e4e867febc728c5daca5c3581e49446 100644 (file)
--- a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild
+++ b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild,v 1.4 2015/01/29 21:48:34 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild,v 1.5 2015/01/30 19:46:16 floppym Exp $
 
 EAPI="5"
 
@@ -86,6 +86,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-1.1-CVE-2014-0250.patch"
        "${FILESDIR}/${P}-uclibc.patch"
        "${FILESDIR}/${P}-cmake.patch"
+       "${FILESDIR}/freerdp-1.1-cmake-3.1.patch"
 )
 
 src_configure() {