From f7b43ba7297f0089b56fb6ee930cb8b6b9253ade Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 23 Jan 2015 01:50:25 +0000 Subject: [PATCH] Add patch from upstream for cmake-3.1 compatibility, bug 537022. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- net-misc/freerdp/ChangeLog | 6 +- net-misc/freerdp/Manifest | 17 +++- .../freerdp/files/freerdp-cmake-3.1.patch | 98 +++++++++++++++++++ .../freerdp-1.2.0_beta1_pre20141115.ebuild | 9 +- net-misc/freerdp/freerdp-9999.1.ebuild | 8 +- 5 files changed, 125 insertions(+), 13 deletions(-) create mode 100644 net-misc/freerdp/files/freerdp-cmake-3.1.patch diff --git a/net-misc/freerdp/ChangeLog b/net-misc/freerdp/ChangeLog index 2ea04f98952a..e697f7ac9e2b 100644 --- a/net-misc/freerdp/ChangeLog +++ b/net-misc/freerdp/ChangeLog @@ -1,6 +1,10 @@ # 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.81 2015/01/23 00:34:07 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/ChangeLog,v 1.82 2015/01/23 01:50:19 floppym Exp $ + + 23 Jan 2015; Mike Gilbert +files/freerdp-cmake-3.1.patch, + freerdp-1.2.0_beta1_pre20141115.ebuild, freerdp-9999.1.ebuild: + Add patch from upstream for cmake-3.1 compatibility, bug 537022. 23 Jan 2015; Patrick Lauer freerdp-1.2.0_beta1_pre20141115.ebuild: diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest index 472260467047..026e58db36a2 100644 --- a/net-misc/freerdp/Manifest +++ b/net-misc/freerdp/Manifest @@ -1,13 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX freerdp-1.1-CVE-2014-0250.patch 12976 SHA256 ea10fd71a81596b990c84771a5475de4abbda954af62d7a73d6cee38e9c05b0d SHA512 87f719670701100419483027982c045f39e2d0d0f39c58907ff508ca5a40cb01e18f9411854d3b947c9d07f5ecf32ddd6124484900801f1402396b2c847f2d71 WHIRLPOOL aef1e9233229db9437cd9817041f5a753177c25b4005b37519a66097f16b0addb64f2466d2e56595c934596f3f3fd6de6f5033109b9c234bfac9f517879f36e5 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 AUX freerdp-1.1.0_beta1_p20130710-uclibc.patch 1921 SHA256 bd740b6c39200edd6979bd9c9d47ff2eb521ff55dedb25285a37fabf19c9ac85 SHA512 6324edec3be28e16291be88b24ce297111e8aa1744d4a1d8633f36f6633890e562e816c3b0cfe30d2792ca27bcedb6b87e9b7f68459d2c663d1b29e0cc5806fa WHIRLPOOL 53cb72c11a4f26d29b30dba3050f2aaae15309753fd827746ac155e52b90950b19662e97bdf92202a837d11c01496129b9ec9c01b490b17395778bfbf9d51098 +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 2626 SHA256 3975fa6ba078b3e370d2113f660cdff871182df97ea2e963fdac25f3ad0c94a9 SHA512 1f494783cb7f7864aae27a7373fae32f17e140ced832aae0e4be63960a4897355bdd21e40074386b957e374710e825a7ccc1a7f7328087741d7a8fc1d0cb94f8 WHIRLPOOL 656aaa4f9932403db42fd4aad3d7ff56613b78f14c516dfccc1aaf185027b0ee81501791138580435cdf3bdef32b27cd6ce0ffba875a2dd63b0b47b34a810b77 EBUILD freerdp-1.1.0_beta1_p20130710-r2.ebuild 2810 SHA256 e03e7655dc1ad45ee8e2cc8a9ec0da09a5a1ee28cf65c27a46b316f0ae621bd9 SHA512 b8a3bf63b81a1c28e15ecea4a07cf5542b9125d2fbc45e6fbff0db230315500e499f1b215b2b02433bd6e2658ad2d20a06dfa6a065ea4e5b6d7bce58541de2bc WHIRLPOOL ca0548877999b72e1842d90fded3af789866e257c770751e1c4cd185e6da97a1b722e9967fa1eb95ac88b7f6b70c9bc479f96c9bfb4aa0ef779e66a96b48e251 -EBUILD freerdp-1.2.0_beta1_pre20141115.ebuild 2751 SHA256 1b045e93146e65ca4a0a3df4fc3875c9f58463dcb72d7f790f996b0dc46590c7 SHA512 2bb299d09fa5af54123ec4e1e334a3209c7e34d131d2a6b70f228d3955377c6f808827e9791ac87e17294db4aa5a34386f4e7b00bdaf40d669a4483942fe4a26 WHIRLPOOL 1ebfb0b1566312896c9b332c335456448a40b7de2070fc0a6297719b13583488c5bde4dcf3f6dff99778171e5a0e7fcbeab1811de57474542fa491f69cc17838 -EBUILD freerdp-9999.1.ebuild 2536 SHA256 dbcdefec7af828ecb76e5aaf473564ac44c339529d7064bef4a0da120dffe2d5 SHA512 08c9ccc87f6adb269b83e022c2143f2737f7e418260ed80668898a50e4d3e77ce44e07039be5571f73fada7de766f6370852105304f9f3961d41bd79e372ced7 WHIRLPOOL 52c0a99f7b3672ebbf8d1a9b38571024e1286a5839cf26226c1477e4a4af623276bb4d04b0552cffb8866e2b5e3dd2221cef9d5db1d9b1662efbebc391ab494e -MISC ChangeLog 12937 SHA256 e201e44ddd80586c34ef9a8b37ebc908c47e1ade3c2efd3a694e1f223172fd2e SHA512 ab6d013fc2fe0c142950a0555a93142985370679747ee5e494d80584fa6ea718d606421ecff7320183d3f1695722efdbda3c35e40b781fc944dd64e87a415748 WHIRLPOOL 95fd39c6268cbb04503b4ff62311844e83f996657e93372afbf73612bcd022f258e510f57175a6bd5b6d10db33febbc31783c5f2c3317e0c93cb58de26397269 +EBUILD freerdp-1.2.0_beta1_pre20141115.ebuild 2683 SHA256 7a458079f205a62dacc2bde3f60c2013cf5207cc88e48fe871d7e6cb97ae0528 SHA512 162f7e64aa9a5968f682ccceae04c839863cc923600f67766972852a94117e809e48655e422bd38ad529c43b63b0ab7cebf7da9930ef36f423bb989d9a85833d WHIRLPOOL 29a68f68c699f7b6e2f5c8eacd819fbf68b1cac103b8863cffbd3952533e0f34117cc532283a078e972d389f331765a78e336bff4bc39f820ff8499862d8f67c +EBUILD freerdp-9999.1.ebuild 2617 SHA256 f4d85de00c6dddfc2c96d09548d524ef2fef9fedb0db759dcc2c372c348a105c SHA512 ae4b30bbfb091ba6047a3403e76d6a12b358bb674dbf24fb9763e3e1ce7f7edc3b35c2b5bb4e805fc7441432c38891b68057221b7cdcf201afb593b5c3ec19a0 WHIRLPOOL 279c293fd6a2d1bf9c18475f080caddb18056f4357740e0eb30149ad58e45853cee627feb1baa00216a96c9f054a27707777b85bbd4097711b0cfdc1eb910a3c +MISC ChangeLog 13151 SHA256 7736d090ff426e03fec5ecc4addae4c532a429d9ac530d182a4558d97bb0a9a6 SHA512 609bd97ffdfd09c7ceed2e27dc3bf4817222fb2a2b24707ec551894b8b23dcd49b53e8ddba6326dae889a80516b2635d108029dc92c95e6b1aa19b3775bddfb1 WHIRLPOOL ef37608d973d6f733cc15096ee11880357bb59eb157f23dd05df29d3b0a6a3d151f3919639c250f445c24e0ddc48a09aa765f58bea223c1d10a49b2408e5d3fa MISC metadata.xml 424 SHA256 677d4fb3c378ea8ee9c4e340b7b32cf57a9f4fe9b92edddb42ddd39448f73f01 SHA512 4f1bb050f9b9889422c2e86b87dd43246b41cf45c1ce4e6c05e1c477c4a3031c20820edfd648cbc4ba2b61d2bae40883fcd5676246a0bc3fe767f5713701cf54 WHIRLPOOL d3ad68eadaf540d6200dc6a15ee3fe3597f80a64c1d2f8b7d22b23fb137422fda2edca1a8438800b31cd5d5dfd74dca23f611ad433b812f8bfe1ac0f1aa85b11 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iF4EAREIAAYFAlTBqOAACgkQC77qH+pIQ6S/KwEAsgOOCEXCXpy8g+A+6/IiSY75 +L8YGOD5jKbJTPmGd1ccBAKChGHAMsyQpX7tdP5EdbSV3GsiFE5bF/jmmwA/jYnPp +=1er4 +-----END PGP SIGNATURE----- diff --git a/net-misc/freerdp/files/freerdp-cmake-3.1.patch b/net-misc/freerdp/files/freerdp-cmake-3.1.patch new file mode 100644 index 000000000000..462fb56396f8 --- /dev/null +++ b/net-misc/freerdp/files/freerdp-cmake-3.1.patch @@ -0,0 +1,98 @@ +From 1b663ceffe51008af7ae9749e5b7999b2f7d6698 Mon Sep 17 00:00:00 2001 +From: Bernhard Miklautz +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/client/CMakeLists.txt b/client/CMakeLists.txt +index 14ed363..b8b7699 100644 +--- a/client/CMakeLists.txt ++++ b/client/CMakeLists.txt +@@ -63,8 +63,8 @@ set(FILENAME "ModuleOptions.cmake") + file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") + + foreach(FILEPATH ${FILEPATHS}) +- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}") +- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" FREERDP_CLIENT ${FILEPATH}) ++ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}") ++ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" FREERDP_CLIENT ${FILEPATH}) + set(FREERDP_CLIENT_ENABLED 0) + include(${FILEPATH}) + if(FREERDP_CLIENT_ENABLED) +diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt +index cda14ba..ee9458e 100644 +--- a/server/CMakeLists.txt ++++ b/server/CMakeLists.txt +@@ -48,8 +48,8 @@ set(FILENAME "ModuleOptions.cmake") + file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") + + foreach(FILEPATH ${FILEPATHS}) +- if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}") +- string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" FREERDP_SERVER ${FILEPATH}) ++ if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}") ++ string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" FREERDP_SERVER ${FILEPATH}) + set(FREERDP_SERVER_ENABLED 0) + include(${FILEPATH}) + if(FREERDP_SERVER_ENABLED) +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.2.0_beta1_pre20141115.ebuild b/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild index 31bc17aac891..9afa19cd03d9 100644 --- a/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild +++ b/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.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.2.0_beta1_pre20141115.ebuild,v 1.4 2015/01/23 00:34:07 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.2.0_beta1_pre20141115.ebuild,v 1.5 2015/01/23 01:50:19 floppym Exp $ EAPI="5" @@ -64,6 +64,7 @@ RDEPEND=" ) ) smartcard? ( sys-apps/pcsc-lite ) + wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libxkbfile @@ -78,10 +79,7 @@ DEPEND="${RDEPEND} " DOCS=( README ) - -src_prepare() { - sed -i -e 's/list(REMOVE_DUPLICATES CHANNEL_STATIC_CLIENT_ENTRIES)//' channels/client/CMakeLists.txt || die -} +PATCHES=( "${FILESDIR}/freerdp-cmake-3.1.patch" ) src_configure() { local mycmakeargs=( @@ -103,7 +101,6 @@ src_configure() { $(cmake-utils_use_with xv XV) $(cmake-utils_use_build test TESTING) $(cmake-utils_use_with wayland WAYLAND) - -DWITH_XKBFILE=OFF ) cmake-utils_src_configure } diff --git a/net-misc/freerdp/freerdp-9999.1.ebuild b/net-misc/freerdp/freerdp-9999.1.ebuild index 3ab7cd858da9..e2e169c78aad 100644 --- a/net-misc/freerdp/freerdp-9999.1.ebuild +++ b/net-misc/freerdp/freerdp-9999.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# 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-9999.1.ebuild,v 1.22 2014/11/26 01:00:24 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-9999.1.ebuild,v 1.23 2015/01/23 01:50:19 floppym Exp $ EAPI="5" @@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/" LICENSE="Apache-2.0" SLOT="0/1.2" IUSE="alsa +client cups debug doc ffmpeg gstreamer jpeg - pulseaudio server smartcard sse2 test usb X xinerama xv" + pulseaudio server smartcard sse2 test usb wayland X xinerama xv" RDEPEND=" dev-libs/openssl @@ -64,6 +64,7 @@ RDEPEND=" ) ) smartcard? ( sys-apps/pcsc-lite ) + wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libxkbfile @@ -98,6 +99,7 @@ src_configure() { $(cmake-utils_use_with xinerama XINERAMA) $(cmake-utils_use_with xv XV) $(cmake-utils_use_build test TESTING) + $(cmake-utils_use_with wayland WAYLAND) ) cmake-utils_src_configure } -- 2.26.2