From 9792af952e4cce2ae6939aa404a79cb9e1d73158 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Mon, 26 Mar 2018 18:18:40 +0100 Subject: Bump to Ice 3.6.4 --- dev-libs/Ice/Ice-3.6.3-r4.ebuild | 15 +- dev-libs/Ice/Ice-3.6.4.ebuild | 353 +++++++++++++++++++++ dev-libs/Ice/Manifest | 20 +- dev-libs/Ice/files/Ice-3.6-csharp.patch | 50 +++ .../files/Ice-3.6-dont-append-c++11-to-libs.patch | 12 + .../files/Ice-3.6-dont-separate-c++11-libs.patch | 18 ++ dev-libs/Ice/files/Ice-3.6-libressl.patch | 164 ++++++++++ dev-libs/Ice/files/Ice-3.6-no-arch-opts.patch | 50 +++ dev-libs/Ice/files/Ice-3.6-slice.patch | 20 ++ dev-libs/Ice/files/Ice-3.6.3-csharp.patch | 50 --- .../Ice-3.6.3-dont-append-c++11-to-libs.patch | 12 - .../files/Ice-3.6.3-dont-separate-c++11-libs.patch | 18 -- dev-libs/Ice/files/Ice-3.6.3-libressl.patch | 164 ---------- dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch | 50 --- dev-libs/Ice/files/Ice-3.6.3-slice.patch | 20 -- 15 files changed, 685 insertions(+), 331 deletions(-) create mode 100644 dev-libs/Ice/Ice-3.6.4.ebuild create mode 100644 dev-libs/Ice/files/Ice-3.6-csharp.patch create mode 100644 dev-libs/Ice/files/Ice-3.6-dont-append-c++11-to-libs.patch create mode 100644 dev-libs/Ice/files/Ice-3.6-dont-separate-c++11-libs.patch create mode 100644 dev-libs/Ice/files/Ice-3.6-libressl.patch create mode 100644 dev-libs/Ice/files/Ice-3.6-no-arch-opts.patch create mode 100644 dev-libs/Ice/files/Ice-3.6-slice.patch delete mode 100644 dev-libs/Ice/files/Ice-3.6.3-csharp.patch delete mode 100644 dev-libs/Ice/files/Ice-3.6.3-dont-append-c++11-to-libs.patch delete mode 100644 dev-libs/Ice/files/Ice-3.6.3-dont-separate-c++11-libs.patch delete mode 100644 dev-libs/Ice/files/Ice-3.6.3-libressl.patch delete mode 100644 dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch delete mode 100644 dev-libs/Ice/files/Ice-3.6.3-slice.patch diff --git a/dev-libs/Ice/Ice-3.6.3-r4.ebuild b/dev-libs/Ice/Ice-3.6.3-r4.ebuild index 19785c4..15400a3 100644 --- a/dev-libs/Ice/Ice-3.6.3-r4.ebuild +++ b/dev-libs/Ice/Ice-3.6.3-r4.ebuild @@ -25,8 +25,9 @@ inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-fun DESCRIPTION="ICE middleware C++ library and generator tools" HOMEPAGE="http://www.zeroc.com/" +ICEVERSION="$(get_version_component_range 1-2)" SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz - doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )" + doc? ( http://download.zeroc.com/Ice/$ICEVERSION/${P}.pdf )" LICENSE="GPL-2" SLOT="0/36" KEYWORDS="amd64 x86" @@ -60,12 +61,12 @@ S="${WORKDIR}/${P/I/i}" PHP_EXT_S="${S}/php" PATCHES=( - "${FILESDIR}/${P}-no-arch-opts.patch" - "${FILESDIR}/${P}-csharp.patch" - "${FILESDIR}/${P}-libressl.patch" - "${FILESDIR}/${P}-dont-append-c++11-to-libs.patch" - "${FILESDIR}/${P}-dont-separate-c++11-libs.patch" - "${FILESDIR}/${P}-slice.patch" + "${FILESDIR}/${PN}-$ICEVERSION-no-arch-opts.patch" + "${FILESDIR}/${PN}-$ICEVERSION-csharp.patch" + "${FILESDIR}/${PN}-$ICEVERSION-libressl.patch" + "${FILESDIR}/${PN}-$ICEVERSION-dont-append-c++11-to-libs.patch" + "${FILESDIR}/${PN}-$ICEVERSION-dont-separate-c++11-libs.patch" + "${FILESDIR}/${PN}-$ICEVERSION-slice.patch" ) pkg_setup() { diff --git a/dev-libs/Ice/Ice-3.6.4.ebuild b/dev-libs/Ice/Ice-3.6.4.ebuild new file mode 100644 index 0000000..f41a974 --- /dev/null +++ b/dev-libs/Ice/Ice-3.6.4.ebuild @@ -0,0 +1,353 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy ) + +RUBY_OPTIONAL="yes" +USE_RUBY="ruby22" + +PHP_EXT_NAME="IcePHP" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +PHP_EXT_OPTIONAL_USE=php + +USE_PHP="php7-0" + +# This variable does not belong to any eclass. It is solely used in this ebuild +# db:6.2 breaks the build process +BERKDB_SLOTS=( 6.1 5.3 5.1 4.8 ) + +inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator + +DESCRIPTION="ICE middleware C++ library and generator tools" +HOMEPAGE="http://www.zeroc.com/" +ICEVERSION="$(get_version_component_range 1-2)" +SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz + doc? ( http://download.zeroc.com/Ice/$ICEVERSION/${P}.pdf )" +LICENSE="GPL-2" +SLOT="0/36" +KEYWORDS="amd64 x86" +IUSE="doc examples libressl +ncurses mono php python ruby c++0x test debug" + +RDEPEND=">=dev-libs/expat-2.0.1 + >=app-arch/bzip2-1.0.5 + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + || ( + $(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done) + ) + dev-cpp/libmcpp + python? ( ${PYTHON_DEPS} ) + ruby? ( $(ruby_implementation_depend ruby22) ) + mono? ( dev-lang/mono ) + php? ( dev-lang/php:7.0 ) + !dev-python/IcePy + !dev-ruby/IceRuby" +DEPEND="${RDEPEND} + ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= ) + test? ( + ${PYTHON_DEPS} + dev-python/passlib[${PYTHON_USEDEP}] + )" + +# Maintainer notes: +# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3}) + +S="${WORKDIR}/${P/I/i}" +PHP_EXT_S="${S}/php" + +PATCHES=( + "${FILESDIR}/${PN}-$ICEVERSION-no-arch-opts.patch" + "${FILESDIR}/${PN}-$ICEVERSION-csharp.patch" + "${FILESDIR}/${PN}-$ICEVERSION-dont-append-c++11-to-libs.patch" + "${FILESDIR}/${PN}-$ICEVERSION-dont-separate-c++11-libs.patch" + "${FILESDIR}/${PN}-$ICEVERSION-slice.patch" +) + +pkg_setup() { + # prevent ruby-ng.eclass from messing with pkg_setup + return +} + +src_unpack() { + # prevent ruby-ng.eclass from messing with src_unpack + default +} + +src_prepare() { + epatch -p1 "${PATCHES[@]}" + + sed -i \ + -e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \ + -e 's|-L\$\(libdir\)||' \ + cpp/config/Make.rules || die "sed failed" + + sed -i \ + -e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \ + -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \ + php/config/Make.rules.php || die "sed failed" + + sed -i \ + -e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \ + -e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \ + -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \ + {python,ruby}/config/Make.rules || die "sed failed" + + sed -i \ + -e 's|-O2 ||g' \ + -e 's|-Werror ||g' \ + cpp/config/Make.rules.Linux || die "sed failed" + + sed -i \ + -e 's|install-common||' \ + {cpp,csharp,php,python,ruby}/Makefile || die "sed failed" + + sed -i \ + -e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \ + -e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \ + -e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \ + csharp/config/Make.rules.cs || die "sed failed" + + # skip mono tests, bug #498484 + sed -i \ + -e '/SUBDIRS/s|\ test||' \ + csharp/Makefile || die "sed failed" + + # IceUtil/stacktrace fails with USE=debug + # skip udp test due to multicast + # skip IceSSL tests due to requirement of internet connection + # IceStorm/stress fails without USE=debug + sed -i \ + -e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \ + cpp/Makefile || die "sed failed" + + # mainly broken .ice files + sed -i \ + -e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \ + python/Makefile || die "sed failed" + + # fails even on unicode locale + sed -i \ + -e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \ + ruby/Makefile || die "sed failed" +} + +src_configure() { + suitable_db_version() { + local ver + for ver in "${BERKDB_SLOTS[@]}"; do + if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then + echo "${ver}" + return 0 + fi + done + die "No suitable BerkDB versions found, aborting" + } + + MAKE_RULES=( + "prefix=\"${ED%/}/usr\"" + "install_docdir=\"${ED%/}/usr/share/doc/${PF}\"" + "install_configdir=\"${ED%/}/usr/share/${P}/config\"" + "install_mandir=\"${ED%/}/usr/share/man\"" + "embedded_runpath_prefix=\"${EPREFIX}/usr\"" + "LP64=yes" + "new_dtags=yes" + "NOTEST=$(usex !test)" + "USE_READLINE=$(usex ncurses)" + "OPTIMIZE=$(usex !debug)" + "CPP11=$(usex c++0x)" + ) + + local BERKDB_VERSION="$(suitable_db_version)" + MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})") + sed -i \ + -e "s|g++|$(tc-getCXX)|" \ + -e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \ + -e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \ + -e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \ + -e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \ + cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed" + + if use python; then + local S="${S}/python" + python_copy_sources + fi + + if use ruby; then + SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" + MAKE_RULES_RUBY=( + "install_rubydir=\"${ED%/}/${SITERUBY}\"" + "install_libdir=\"${ED%/}/${SITERUBY}\"" + ) + + # make it use ruby22 only + sed -i \ + -e 's|RUBY = ruby|\022|' \ + ruby/config/Make.rules || die "sed failed" + sed -i \ + -e 's|env ruby|\022|' \ + ruby/config/s2rb.rb || die "sed failed" + sed -i \ + -e 's|env ruby|\022|' \ + ruby/scripts/slice2rb || die "sed failed" + sed -i \ + -e 's|output.write("ruby|\022|' \ + scripts/TestUtil.py || die "sed failed" + fi + + MAKE_RULES_MONO=( + "GACINSTALL=yes" + "GAC_ROOT=\"${ED%/}/usr/$(get_libdir)\"" + "GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\"" + "install_libdir=\"${ED%/}/usr/$(get_libdir)\"" + "install_pkgconfigdir=\"${ED%/}/usr/$(get_libdir)/pkgconfig\"" + ) + + if has_version ">dev-lang/mono-4"; then + MAKE_RULES_MONO+=("MCS=mcs") + fi + + use test && python_setup +} + +src_compile() { + # Do not remove this export or build will break! + tc-export CXX + + emake -C cpp "${MAKE_RULES[@]}" + + if use php; then + local i + for i in $(php_get_slots); do + mkdir -p "${WORKDIR}/${i}" || die + cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory" + + pushd "${WORKDIR}/${i}" >/dev/null || die + ln -s "${S}/cpp" || die + ln -s "${S}/config" || die + ln -s "${S}/slice" || die + ln -s "${S}/Makefile" || die + + emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\"" + popd >/dev/null || die + done + fi + + if use python; then + building() { + emake -C "${BUILD_DIR}" "${MAKE_RULES[@]}" PYTHON="${EPYTHON}" + } + local S="${S}/python" + python_foreach_impl building + fi + + if use ruby; then + emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" + fi + + if use mono; then + emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" + fi +} + +src_test() { + local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + emake -C cpp "${MAKE_RULES[@]}" test + + # php tests require the extension loaded and are therefore skipped + + if use python; then + testing() { + emake -C "${BUILD_DIR}" \ + "${MAKE_RULES[@]}" \ + PYTHON="${EPYTHON}" \ + install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \ + install_libdir="\"${D%/}/$(python_get_sitedir)\"" test + } + local S="${S}/python" + python_foreach_impl testing + fi + + if use ruby; then + emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test + fi + + if use mono; then + # skip mono tests, bug #498484 + ewarn "Tests for C# are currently disabled." + #emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test + fi +} + +src_install() { + local DOCS=( CHANGELOG*.md README.md ) + use doc && DOCS+=( "${DISTDIR}/${P}.pdf" ) + einstalldocs + + insinto /usr/share/${P} + doins -r slice + + emake -C cpp "${MAKE_RULES[@]}" install + + if use examples; then + docinto examples-cpp + dodoc cpp/config/*.cfg + docompress -x /usr/share/doc/${PF}/examples-cpp + fi + + if use php; then + insinto "/usr/share/php/${PN}" + + local i + while IFS="" read -d $'\0' -r i; do + doins "${i}" + done < <(find "${S}/php/lib/" -name '*.php' -print0) + + pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die + + local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}" + for i in *; do + mkdir -p "${ED%/}/usr/share/php/${i}" || die + "${ED%/}"/usr/bin/slice2php \ + -I"${ED%/}/usr/share/${P}/slice/" --all \ + --output-dir "${ED%/}/usr/share/php/${i}" \ + --ice "${ED%/}/usr/share/${P}/slice/${i}"/* + done + + for i in $(php_get_slots); do + php_init_slot_env "${i}" + insinto "${EXT_DIR}" + newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" + done + php-ext-source-r2_createinifiles + + popd >/dev/null || die + fi + + if use python; then + installation() { + mkdir -p "${D%/}/$(python_get_sitedir)" || die + + emake -C "${BUILD_DIR}" \ + "${MAKE_RULES[@]}" \ + install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \ + install_libdir="\"${D%/}/$(python_get_sitedir)\"" \ + install + } + local S="${S}/python" + python_foreach_impl installation + fi + + if use ruby; then + dodir "${SITERUBY}" + emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install + fi + + if use mono; then + emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install + fi +} diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest index 7f7fbec..24ffdfe 100644 --- a/dev-libs/Ice/Manifest +++ b/dev-libs/Ice/Manifest @@ -1,12 +1,12 @@ -AUX Ice-3.6.3-csharp.patch 1573 BLAKE2B 9c1c645a25006ff5e120f7a14933511394315da6e72ebe1f93ff3ad8add69ff1a0b778433f9d70b4982322aed20d99ee37480d316cd3e0534ac84977a952edb5 SHA512 62741327524cea96652179811c0591ed7e75b75a27623cb24fe2e55c47150692d862aa78039ed82a081236273163015d4b7e56817ac13ccd63ca1042e641704f -AUX Ice-3.6.3-dont-append-c++11-to-libs.patch 373 BLAKE2B 122f6c1c06acc6f8bfbe6e50665c4f366393be7b282749ec3aa7a61054707eeaadf588c2fd3b7af93c703a984f47868477582d04979bdfc2280ef2829b8964f3 SHA512 fc4ec14c1ea9ec032b530afffc9d079f7ce3596d9d69cfe4aacf5fdc7429ee508fead314ecc1aed28839696df56a8488aa8b4161540a125bd2c9a2088765af0d -AUX Ice-3.6.3-dont-separate-c++11-libs.patch 557 BLAKE2B 69f179733d55cef47a90162e4aaa379cb3c49f69661445c8d05872e61c98dbff81d29775418d3e1f2d689df53400ef56e18ba02c936f41a362d7afe972f10fd0 SHA512 44fc28e81a7ffde8e48f5b0fbaaba38e695bab749a7f0533a52816b088011641a341ed7d67fb439da0751b29e9f91fb17e54027c576b48a73e6208bee6d4f0b1 -AUX Ice-3.6.3-libressl.patch 6461 BLAKE2B ab5f4b8812adb7f7b15257bbc5f2745ca3da46c9c4d6b80764475045bedb78f15047eb70a76697e1fd299f913861ca39692ea87ed872761e1bb0884ac93a1550 SHA512 386ed4d666ea76a16255e7e5023be9880ac1f5e26ffec3d19560484eb6ace158f134c1d425586c1f654d7dc58732c17ed4b190eaf26f4aba0cd4bc319abe50cb -AUX Ice-3.6.3-no-arch-opts.patch 1462 BLAKE2B 0adbbb302a3fde0dab4dba0b5947ee5da3413a8c3dc02fb8612837f4a2b3ecb56b92628430d8f3c2315f1fb0fa057bf0942dd389941b61d70d12b4078ce45d84 SHA512 236abce89a7bcf64d6a12db5a82d62db1effa2b5a105ae7c83910f02ca1ccd610193097a2c959d2a487f0d641af70ba8013bcfe570e2af40976d9a1017272e6e -AUX Ice-3.6.3-slice.patch 897 BLAKE2B 8a49d13dc35100fa7cc1f07375a15668208f0a790b5de1989e280e7aa50de22675ffb6048bee926d7e18924f581129b28b9ec386d7f56cfdab54272839878a73 SHA512 f2eabb30206183f96e81b1988787854e7602328373dba359197a3af4ec7aaefd69862b4e634fca6a5f6d27bd43bea61832d54d32153be19c064039b1d327bed4 +AUX Ice-3.6-csharp.patch 1573 BLAKE2B 9c1c645a25006ff5e120f7a14933511394315da6e72ebe1f93ff3ad8add69ff1a0b778433f9d70b4982322aed20d99ee37480d316cd3e0534ac84977a952edb5 SHA512 62741327524cea96652179811c0591ed7e75b75a27623cb24fe2e55c47150692d862aa78039ed82a081236273163015d4b7e56817ac13ccd63ca1042e641704f +AUX Ice-3.6-dont-append-c++11-to-libs.patch 373 BLAKE2B 122f6c1c06acc6f8bfbe6e50665c4f366393be7b282749ec3aa7a61054707eeaadf588c2fd3b7af93c703a984f47868477582d04979bdfc2280ef2829b8964f3 SHA512 fc4ec14c1ea9ec032b530afffc9d079f7ce3596d9d69cfe4aacf5fdc7429ee508fead314ecc1aed28839696df56a8488aa8b4161540a125bd2c9a2088765af0d +AUX Ice-3.6-dont-separate-c++11-libs.patch 557 BLAKE2B 69f179733d55cef47a90162e4aaa379cb3c49f69661445c8d05872e61c98dbff81d29775418d3e1f2d689df53400ef56e18ba02c936f41a362d7afe972f10fd0 SHA512 44fc28e81a7ffde8e48f5b0fbaaba38e695bab749a7f0533a52816b088011641a341ed7d67fb439da0751b29e9f91fb17e54027c576b48a73e6208bee6d4f0b1 +AUX Ice-3.6-libressl.patch 6461 BLAKE2B ab5f4b8812adb7f7b15257bbc5f2745ca3da46c9c4d6b80764475045bedb78f15047eb70a76697e1fd299f913861ca39692ea87ed872761e1bb0884ac93a1550 SHA512 386ed4d666ea76a16255e7e5023be9880ac1f5e26ffec3d19560484eb6ace158f134c1d425586c1f654d7dc58732c17ed4b190eaf26f4aba0cd4bc319abe50cb +AUX Ice-3.6-no-arch-opts.patch 1462 BLAKE2B 0adbbb302a3fde0dab4dba0b5947ee5da3413a8c3dc02fb8612837f4a2b3ecb56b92628430d8f3c2315f1fb0fa057bf0942dd389941b61d70d12b4078ce45d84 SHA512 236abce89a7bcf64d6a12db5a82d62db1effa2b5a105ae7c83910f02ca1ccd610193097a2c959d2a487f0d641af70ba8013bcfe570e2af40976d9a1017272e6e +AUX Ice-3.6-slice.patch 897 BLAKE2B 8a49d13dc35100fa7cc1f07375a15668208f0a790b5de1989e280e7aa50de22675ffb6048bee926d7e18924f581129b28b9ec386d7f56cfdab54272839878a73 SHA512 f2eabb30206183f96e81b1988787854e7602328373dba359197a3af4ec7aaefd69862b4e634fca6a5f6d27bd43bea61832d54d32153be19c064039b1d327bed4 DIST Ice-3.6.3.pdf 8844957 BLAKE2B 137e3ce85885305931cbbb2c838ccc52175dffb7ad51264837b2db77eea05987ebecc5e3678e2f589bef1cc94c133f0f298ecce23031fcf2654621921c2bd541 SHA512 44638a315b0da9c26519c053c48ab8ee216c43410f53844465535a972ae01031f1603769e9b3169fdf9358de67e0d0c7e238b2918b5d5b1c4cb95cb922fa922a DIST Ice-3.6.3.tar.gz 5512741 BLAKE2B 7219cd263ccf6207c0d1e788358004744bd53717bba79a53be468b5e38ddbc81895ef078ba31c98d90ac9ccdd9e17123f4a7ab590fa354c28f6d82f09bf0301d SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45 -DIST Ice-3.7.0.pdf 9311809 BLAKE2B 881bcfdfc675c805ab2fa24462d25be45f2f1597b3a1af3834423ca91a01bffcad6284e44236202b6298d252d8cd98a43f2fb990e9eb126283961a635eb753a8 SHA512 13a2ffd2c086e8663584037bcf940f4f749c850c2cd894ba16d1682e742b168210ddd5fe3f2c57555da8b306435d314e951c6c716e630c28268baf8d0f708c2e -DIST Ice-3.7.0.tar.gz 7388646 BLAKE2B dd07a6fd5816907729e1f128cccf6e8d165ddd2cf7161def32f24a1d379bd0855dbd123460aecbae11ccc92934a63798ca118caf625c2f5c720d6a3fd97cef0c SHA512 d792b0eaf3f5365a55432f95a9fa063ef70018533c1afc7c72006c39739d61ca92e36154bd0198eec13e24949359ab23fed356181b822230a884d1899d03e044 -EBUILD Ice-3.6.3-r4.ebuild 9304 BLAKE2B cd58a9d02fe4858e82b0ac2476c21d30064bf05e265921e5f7c75a9cc7132692d04e94ec52a8fa48dbf1962ebc88c513c06651bd3563e700867e339c13692b88 SHA512 09bb2f83e695e95f648b241f4cdbffdc97fe9e35f143c9308fb36b3d1ba7576f2af09168007cc3a2bd46fc4881758f3cc4903ea75e0ca906ec5e51a9942dec89 -EBUILD Ice-3.7.0.ebuild 7718 BLAKE2B c410d1576af23eca577c92fedac808b2a30b7022b73f23df857782f570bb147f0e9fbe1fa1593ef18f45585e951010045055274b898fda4df6f65ecfef3f0fe8 SHA512 ea69600fe79a6b23e033755a8b53cc90d180359e145deaa7790f6ea1cbdbd9b6b27c32d7d805d10fd883ca183985c1f3bdd047fbbd2df553ac896aef58f9498f +DIST Ice-3.6.4.pdf 8907736 BLAKE2B 5a631c1e2e147c8ed3b31a84192210c92bbe83e8644ec9d7d164d1b94a20069ce77f6baf54910ac00c7216cbc2979caac6fa78457e9292a84407e93000f9903a SHA512 9bd2d373eb83e08e563cab174a53063a490367dea3e4b910f93f0477c3817282c859f07e46e503006e9bd37678fb6da31a58b88bfabd217b5e371fff685321a0 +DIST Ice-3.6.4.tar.gz 5523841 BLAKE2B 4e50dcf0f004f14a38c173f181cabb97fdc201786c338800b9750dc0cf6ce9b1397ea26b4357de1f6e1ac6b4e69abbe2bf464a5f9c2926f6ae45abbf5a69803b SHA512 fdb412ce591bca7aede2ac7d70600184f3b67279e8ffdfee3649f517d5531d2dfee54b37d0cc6de2ef5de8ecd281c39d6c951781b68f9a36316a7607cefb9e57 +EBUILD Ice-3.6.3-r4.ebuild 9407 BLAKE2B 0f15afaa77cdb5a41a57babdf62bde7b981bfe7da219fd3d7273cdacbb9ab42d9729060960c0f6f334078f19089e7c27d7464bf2eca91c8216aa7b7880a2d254 SHA512 7f794f9f6d44e8afef704ec9f23ae534eb7010a3be4ffd2f79387b4a2a2354848e94c355a3ee15eea61d905f2e95191e27542e0790e9e20ba3cdbd6b844b6e66 +EBUILD Ice-3.6.4.ebuild 9359 BLAKE2B 62f3d034c29e8730a1df1c61d587ff27856dd1ae8cbdb00db2688e8e51e978eaff40096b83e36cf0ad1a127eeafff906b44919cff1109b93cdefb2f09ec485d6 SHA512 332c4f130952630db33ee175998bc95522fe1de4cb17d2272e1e89094989b74640b2e495196e483d0a38bb9efc27fb15bd124367ad8f5e2aa0d24405505fcc98 diff --git a/dev-libs/Ice/files/Ice-3.6-csharp.patch b/dev-libs/Ice/files/Ice-3.6-csharp.patch new file mode 100644 index 0000000..e9dce11 --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.6-csharp.patch @@ -0,0 +1,50 @@ +--- ice-3.6.3/csharp/src/Makefile~ 2015-06-23 17:30:20.000000000 +0200 ++++ ice-3.6.3/csharp/src/Makefile 2015-06-27 20:07:04.217188211 +0200 +@@ -11,7 +11,7 @@ + + include $(top_srcdir)/config/Make.rules.cs + +-SUBDIRS = Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox IceDiscovery IceLocatorDiscovery ++SUBDIRS = Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox IceSSL IceDiscovery IceLocatorDiscovery + + $(EVERYTHING):: + @for subdir in $(SUBDIRS); \ +--- /dev/null 2015-06-27 16:44:15.733558105 +0200 ++++ ice-3.6.3/csharp/lib/pkgconfig/IceSSL.pc 2015-06-27 20:19:30.731894653 +0200 +@@ -0,0 +1,10 @@ ++version = 3.6.3 ++mono_root = /usr ++ ++name = IceSSL ++ ++Name: ${name} ++Description: IceSSL run-time support ++Version: ${version} ++Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll ++Requires: Ice = ${version} +--- /dev/null 2015-06-27 16:44:15.733558105 +0200 ++++ ice-3.6.3/csharp/lib/pkgconfig/IceDiscovery.pc 2015-06-27 20:20:44.312515987 +0200 +@@ -0,0 +1,10 @@ ++version = 3.6.3 ++mono_root = /usr ++ ++name = IceDiscovery ++ ++Name: ${name} ++Description: IceDiscovery run-time support ++Version: ${version} ++Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll ++Requires: Ice = ${version} +--- /dev/null 2015-06-27 16:44:15.733558105 +0200 ++++ ice-3.6.3/csharp/lib/pkgconfig/IceLocatorDiscovery.pc 2015-06-27 20:21:22.206185123 +0200 +@@ -0,0 +1,10 @@ ++version = 3.6.3 ++mono_root = /usr ++ ++name = IceLocatorDiscovery ++ ++Name: ${name} ++Description: IceLocatorDiscovery run-time support ++Version: ${version} ++Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll ++Requires: Ice = ${version} diff --git a/dev-libs/Ice/files/Ice-3.6-dont-append-c++11-to-libs.patch b/dev-libs/Ice/files/Ice-3.6-dont-append-c++11-to-libs.patch new file mode 100644 index 0000000..c0133ea --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.6-dont-append-c++11-to-libs.patch @@ -0,0 +1,12 @@ +diff --git cpp/src/Ice/DynamicLibrary.cpp cpp/src/Ice/DynamicLibrary.cpp +index d70e14b..721832b 100644 +--- ice-3.6.3/cpp/src/Ice/DynamicLibrary.cpp ++++ ice-3.6.3/cpp/src/Ice/DynamicLibrary.cpp +@@ -16,7 +16,6 @@ + #endif + + #if defined(ICE_CPP11) && defined(__GNUC__) && (__GNUC__ < 6) && defined(__GLIBCXX__) +-# define ICE_LIBSUFFIX "++11" + #endif + + using namespace Ice; diff --git a/dev-libs/Ice/files/Ice-3.6-dont-separate-c++11-libs.patch b/dev-libs/Ice/files/Ice-3.6-dont-separate-c++11-libs.patch new file mode 100644 index 0000000..2b30a21 --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.6-dont-separate-c++11-libs.patch @@ -0,0 +1,18 @@ +--- ice-3.6.3/config/Make.common.rules 2015-06-23 16:30:20.000000000 +0100 ++++ ice-3.6.3/config/Make.common.rules 2015-07-04 17:45:58.061422073 +0100 +@@ -115,15 +115,6 @@ + lp32suffix = /i386-linux-gnu + endif + +-ifeq ($(CPP11),yes) +- ifneq ($(UNAME),Darwin) +- cpp11libdirsuffix = /c++11 +- cpp11libsuffix = ++11 +- cpp11sonamedir = ../ +- binsuffix := $(binsuffix)$(cpp11libsuffix) +- endif +-endif +- + ifneq ($(findstring MINGW,$(UNAME)),) + UNAME := MINGW + lp64suffix := /x64 diff --git a/dev-libs/Ice/files/Ice-3.6-libressl.patch b/dev-libs/Ice/files/Ice-3.6-libressl.patch new file mode 100644 index 0000000..e7d42e3 --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.6-libressl.patch @@ -0,0 +1,164 @@ +From cbbac2c31a04e956261489ce75c962be7e2454ae Mon Sep 17 00:00:00 2001 +From: Joe George +Date: Mon, 12 Dec 2016 11:51:41 -0500 +Subject: [PATCH] ICE-7445 - Add libressl build support + +--- + cpp/src/IceSSL/OpenSSLEngine.cpp | 20 ++++++++++---------- + cpp/src/IceSSL/OpenSSLTransceiverI.cpp | 6 +++--- + cpp/src/IceSSL/Util.cpp | 8 ++++---- + 3 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp +index 8c45950..7360d06 100644 +--- a/cpp/src/IceSSL/OpenSSLEngine.cpp ++++ b/cpp/src/IceSSL/OpenSSLEngine.cpp +@@ -43,7 +43,7 @@ IceUtil::Mutex* staticMutex = 0; + int instanceCount = 0; + bool initOpenSSL = false; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + IceUtil::Mutex* locks = 0; + #endif + +@@ -59,10 +59,10 @@ class Init + ~Init() + { + // +- // OpenSSL 1.1.0 introduces a new thread API and removes ++ // OpenSSL 1.1.0 introduces a new thread API and removes + // the need to use a custom thread callback. + // +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + CRYPTO_set_locking_callback(0); + CRYPTO_set_id_callback(0); + +@@ -84,10 +84,10 @@ extern "C" + { + + // +-// OpenSSL 1.1.0 introduces a new thread API and removes ++// OpenSSL 1.1.0 introduces a new thread API and removes + // the need to use a custom thread callback. + // +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + // + // OpenSSL mutex callback. + // +@@ -158,7 +158,7 @@ IceSSL_opensslPasswordCallback(char* buf, int size, int flag, void* userData) + DH* + IceSSL_opensslDHCallback(SSL* ssl, int /*isExport*/, int keyLength) + { +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX* ctx = SSL_get_SSL_CTX(ssl); + # else + SSL_CTX* ctx = ssl->ctx; +@@ -219,7 +219,7 @@ OpenSSLEngine::OpenSSLEngine(const CommunicatorPtr& communicator) : + // + // OpenSSL 1.1.0 remove the need for library initialization and cleanup. + // +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + // + // Create the mutexes and set the callbacks. + // +@@ -326,7 +326,7 @@ OpenSSLEngine::~OpenSSLEngine() + // + // OpenSSL 1.1.0 remove the need for library initialization and cleanup. + // +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + // + // Clean up OpenSSL resources. + // +@@ -399,7 +399,7 @@ OpenSSLEngine::initialize() + "IceSSL: unable to create SSL context:\n" + sslErrors()); + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + int securityLevel = properties->getPropertyAsIntWithDefault(propPrefix + "SecurityLevel", -1); + if(securityLevel != -1) + { +@@ -954,7 +954,7 @@ OpenSSLEngine::parseProtocols(const StringSeq& protocols) const + SSL_METHOD* + OpenSSLEngine::getMethod(int /*protocols*/) + { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_METHOD* meth = const_cast(TLS_method()); + #else + // +diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +index d66c5eb..9f07044 100644 +--- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp ++++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +@@ -36,7 +36,7 @@ using namespace IceSSL; + // + // See: http://cvs.openssl.org/chngview?cn=22569 + // +-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) + namespace + { + +@@ -156,13 +156,13 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B + // + // See: http://cvs.openssl.org/chngview?cn=22569 + // +-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) + IceUtilInternal::MutexPtrLock sync(sslMutex); + #endif + + int ret = _incoming ? SSL_accept(_ssl) : SSL_connect(_ssl); + +-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) + sync.release(); + #endif + if(ret <= 0) +diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp +index a60ee4c..50c47f3 100644 +--- a/cpp/src/IceSSL/Util.cpp ++++ b/cpp/src/IceSSL/Util.cpp +@@ -110,7 +110,7 @@ namespace + { + + # ifndef OPENSSL_NO_DH +-# if OPENSSL_VERSION_NUMBER < 0x10100000L ++# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + // The following arrays are predefined Diffie Hellman group parameters. + // These are known strong primes, distributed with the OpenSSL library +@@ -228,7 +228,7 @@ unsigned char dh4096_g[] = { 0x02 }; + // + // With OpenSSL 1.1.0 is no longer possible to acess the DH p and g + // data members to set the DH params. We still use the same default +-// parameters but they were converted to DER format using ++// parameters but they were converted to DER format using + // i2d_DHparams and can be restored using d2i_DHparams + + unsigned char dh512[] = +@@ -338,7 +338,7 @@ unsigned char dh4096[] = + // + // Convert a predefined parameter set into a DH value. + // +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + static DH* + convertDH(const unsigned char* buf, int len) + { +@@ -428,7 +428,7 @@ IceSSL::DHParams::get(int keyLength) + // No match found. Use one of the predefined parameter sets instead. + // + IceUtil::Mutex::Lock sync(*this); +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + if(keyLength >= 4096) + { + if(!_dh4096) diff --git a/dev-libs/Ice/files/Ice-3.6-no-arch-opts.patch b/dev-libs/Ice/files/Ice-3.6-no-arch-opts.patch new file mode 100644 index 0000000..149a31e --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.6-no-arch-opts.patch @@ -0,0 +1,50 @@ +--- ice-3.6.3/cpp/config/Make.rules.Linux~ 2015-06-27 16:56:56.000000000 +0200 ++++ ice-3.6.3/cpp/config/Make.rules.Linux 2015-06-27 17:23:45.810591931 +0200 +@@ -79,19 +79,6 @@ + CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED + endif + +- # +- # Only use multilib -m32/-m64 options for amd64 arch, x32 arch can also run +- # in amd64 macines but doesn't use multilib, in this case MACHINE_TYPE will +- # be x86_64 and HOST_ARCH x32. +- # +- ifeq ($(HOST_ARCH),amd64) +- ifeq ($(LP64),yes) +- CXXARCHFLAGS += -m64 +- else +- CXXARCHFLAGS += -m32 +- endif +- endif +- + CXXFLAGS += $(CXXARCHFLAGS) -fvisibility=hidden -Wall -Werror -pthread + + # If MAXWARN is set then enable extra warnings +--- ice-3.6.3/config/Make.common.rules~ 2015-06-23 17:30:20.000000000 +0200 ++++ ice-3.6.3/config/Make.common.rules 2015-06-28 01:53:57.149666595 +0200 +@@ -101,25 +101,7 @@ + ifeq ($(LP64),) + LP64 = yes + endif +- +- # +- # x86 binaries build on x86_64 machine use 32 binsuffix +- # +- ifneq ($(STATICLIBS),yes) +- ifneq ($(LP64),yes) +- binsuffix = 32 +- endif +- endif + endif +- +- # +- # x86 builds uses 32 binsuffix +- # +- ifneq ($(STATICLIBS),yes) +- ifeq ($(findstring $(MACHINE_TYPE),i386 i486 i586 i686),$(MACHINE_TYPE)) +- binsuffix = 32 +- endif +- endif + endif + + ifeq ($(CPP11),yes) diff --git a/dev-libs/Ice/files/Ice-3.6-slice.patch b/dev-libs/Ice/files/Ice-3.6-slice.patch new file mode 100644 index 0000000..fa04684 --- /dev/null +++ b/dev-libs/Ice/files/Ice-3.6-slice.patch @@ -0,0 +1,20 @@ +commit c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7 +Author: Benoit Foucher +Date: Mon Jun 27 17:54:30 2016 +0200 + + Refactored SSL and iAP transports, support for running SSL on top + of TCP/iAP/Bluetooth. + +diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp +index 81c335ad2d..5fe808581f 100644 +--- a/cpp/src/slice2cpp/Gen.cpp ++++ b/cpp/src/slice2cpp/Gen.cpp +@@ -2527,7 +2527,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) + } + + bool hasBaseClass = !bases.empty() && !bases.front()->isInterface(); +- bool override = p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic()); ++ bool override = !p->isLocal() && p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic()); + bool hasGCObjectBaseClass = basePreserved || override || preserved; + if(!basePreserved && (override || preserved)) + { diff --git a/dev-libs/Ice/files/Ice-3.6.3-csharp.patch b/dev-libs/Ice/files/Ice-3.6.3-csharp.patch deleted file mode 100644 index e9dce11..0000000 --- a/dev-libs/Ice/files/Ice-3.6.3-csharp.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- ice-3.6.3/csharp/src/Makefile~ 2015-06-23 17:30:20.000000000 +0200 -+++ ice-3.6.3/csharp/src/Makefile 2015-06-27 20:07:04.217188211 +0200 -@@ -11,7 +11,7 @@ - - include $(top_srcdir)/config/Make.rules.cs - --SUBDIRS = Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox IceDiscovery IceLocatorDiscovery -+SUBDIRS = Ice IceStorm Glacier2 IcePatch2 IceGrid IceBox IceSSL IceDiscovery IceLocatorDiscovery - - $(EVERYTHING):: - @for subdir in $(SUBDIRS); \ ---- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.3/csharp/lib/pkgconfig/IceSSL.pc 2015-06-27 20:19:30.731894653 +0200 -@@ -0,0 +1,10 @@ -+version = 3.6.3 -+mono_root = /usr -+ -+name = IceSSL -+ -+Name: ${name} -+Description: IceSSL run-time support -+Version: ${version} -+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll -+Requires: Ice = ${version} ---- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.3/csharp/lib/pkgconfig/IceDiscovery.pc 2015-06-27 20:20:44.312515987 +0200 -@@ -0,0 +1,10 @@ -+version = 3.6.3 -+mono_root = /usr -+ -+name = IceDiscovery -+ -+Name: ${name} -+Description: IceDiscovery run-time support -+Version: ${version} -+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll -+Requires: Ice = ${version} ---- /dev/null 2015-06-27 16:44:15.733558105 +0200 -+++ ice-3.6.3/csharp/lib/pkgconfig/IceLocatorDiscovery.pc 2015-06-27 20:21:22.206185123 +0200 -@@ -0,0 +1,10 @@ -+version = 3.6.3 -+mono_root = /usr -+ -+name = IceLocatorDiscovery -+ -+Name: ${name} -+Description: IceLocatorDiscovery run-time support -+Version: ${version} -+Libs: -r:${mono_root}/lib/mono/${name}/${name}.dll -+Requires: Ice = ${version} diff --git a/dev-libs/Ice/files/Ice-3.6.3-dont-append-c++11-to-libs.patch b/dev-libs/Ice/files/Ice-3.6.3-dont-append-c++11-to-libs.patch deleted file mode 100644 index c0133ea..0000000 --- a/dev-libs/Ice/files/Ice-3.6.3-dont-append-c++11-to-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git cpp/src/Ice/DynamicLibrary.cpp cpp/src/Ice/DynamicLibrary.cpp -index d70e14b..721832b 100644 ---- ice-3.6.3/cpp/src/Ice/DynamicLibrary.cpp -+++ ice-3.6.3/cpp/src/Ice/DynamicLibrary.cpp -@@ -16,7 +16,6 @@ - #endif - - #if defined(ICE_CPP11) && defined(__GNUC__) && (__GNUC__ < 6) && defined(__GLIBCXX__) --# define ICE_LIBSUFFIX "++11" - #endif - - using namespace Ice; diff --git a/dev-libs/Ice/files/Ice-3.6.3-dont-separate-c++11-libs.patch b/dev-libs/Ice/files/Ice-3.6.3-dont-separate-c++11-libs.patch deleted file mode 100644 index 2b30a21..0000000 --- a/dev-libs/Ice/files/Ice-3.6.3-dont-separate-c++11-libs.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ice-3.6.3/config/Make.common.rules 2015-06-23 16:30:20.000000000 +0100 -+++ ice-3.6.3/config/Make.common.rules 2015-07-04 17:45:58.061422073 +0100 -@@ -115,15 +115,6 @@ - lp32suffix = /i386-linux-gnu - endif - --ifeq ($(CPP11),yes) -- ifneq ($(UNAME),Darwin) -- cpp11libdirsuffix = /c++11 -- cpp11libsuffix = ++11 -- cpp11sonamedir = ../ -- binsuffix := $(binsuffix)$(cpp11libsuffix) -- endif --endif -- - ifneq ($(findstring MINGW,$(UNAME)),) - UNAME := MINGW - lp64suffix := /x64 diff --git a/dev-libs/Ice/files/Ice-3.6.3-libressl.patch b/dev-libs/Ice/files/Ice-3.6.3-libressl.patch deleted file mode 100644 index e7d42e3..0000000 --- a/dev-libs/Ice/files/Ice-3.6.3-libressl.patch +++ /dev/null @@ -1,164 +0,0 @@ -From cbbac2c31a04e956261489ce75c962be7e2454ae Mon Sep 17 00:00:00 2001 -From: Joe George -Date: Mon, 12 Dec 2016 11:51:41 -0500 -Subject: [PATCH] ICE-7445 - Add libressl build support - ---- - cpp/src/IceSSL/OpenSSLEngine.cpp | 20 ++++++++++---------- - cpp/src/IceSSL/OpenSSLTransceiverI.cpp | 6 +++--- - cpp/src/IceSSL/Util.cpp | 8 ++++---- - 3 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp -index 8c45950..7360d06 100644 ---- a/cpp/src/IceSSL/OpenSSLEngine.cpp -+++ b/cpp/src/IceSSL/OpenSSLEngine.cpp -@@ -43,7 +43,7 @@ IceUtil::Mutex* staticMutex = 0; - int instanceCount = 0; - bool initOpenSSL = false; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - IceUtil::Mutex* locks = 0; - #endif - -@@ -59,10 +59,10 @@ class Init - ~Init() - { - // -- // OpenSSL 1.1.0 introduces a new thread API and removes -+ // OpenSSL 1.1.0 introduces a new thread API and removes - // the need to use a custom thread callback. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_set_locking_callback(0); - CRYPTO_set_id_callback(0); - -@@ -84,10 +84,10 @@ extern "C" - { - - // --// OpenSSL 1.1.0 introduces a new thread API and removes -+// OpenSSL 1.1.0 introduces a new thread API and removes - // the need to use a custom thread callback. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // - // OpenSSL mutex callback. - // -@@ -158,7 +158,7 @@ IceSSL_opensslPasswordCallback(char* buf, int size, int flag, void* userData) - DH* - IceSSL_opensslDHCallback(SSL* ssl, int /*isExport*/, int keyLength) - { --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CTX* ctx = SSL_get_SSL_CTX(ssl); - # else - SSL_CTX* ctx = ssl->ctx; -@@ -219,7 +219,7 @@ OpenSSLEngine::OpenSSLEngine(const CommunicatorPtr& communicator) : - // - // OpenSSL 1.1.0 remove the need for library initialization and cleanup. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // - // Create the mutexes and set the callbacks. - // -@@ -326,7 +326,7 @@ OpenSSLEngine::~OpenSSLEngine() - // - // OpenSSL 1.1.0 remove the need for library initialization and cleanup. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // - // Clean up OpenSSL resources. - // -@@ -399,7 +399,7 @@ OpenSSLEngine::initialize() - "IceSSL: unable to create SSL context:\n" + sslErrors()); - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - int securityLevel = properties->getPropertyAsIntWithDefault(propPrefix + "SecurityLevel", -1); - if(securityLevel != -1) - { -@@ -954,7 +954,7 @@ OpenSSLEngine::parseProtocols(const StringSeq& protocols) const - SSL_METHOD* - OpenSSLEngine::getMethod(int /*protocols*/) - { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_METHOD* meth = const_cast(TLS_method()); - #else - // -diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp -index d66c5eb..9f07044 100644 ---- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp -+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp -@@ -36,7 +36,7 @@ using namespace IceSSL; - // - // See: http://cvs.openssl.org/chngview?cn=22569 - // --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) - namespace - { - -@@ -156,13 +156,13 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B - // - // See: http://cvs.openssl.org/chngview?cn=22569 - // --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) - IceUtilInternal::MutexPtrLock sync(sslMutex); - #endif - - int ret = _incoming ? SSL_accept(_ssl) : SSL_connect(_ssl); - --#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL -+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x100000bfL && !defined(LIBRESSL_VERSION_NUMBER) - sync.release(); - #endif - if(ret <= 0) -diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp -index a60ee4c..50c47f3 100644 ---- a/cpp/src/IceSSL/Util.cpp -+++ b/cpp/src/IceSSL/Util.cpp -@@ -110,7 +110,7 @@ namespace - { - - # ifndef OPENSSL_NO_DH --# if OPENSSL_VERSION_NUMBER < 0x10100000L -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - // The following arrays are predefined Diffie Hellman group parameters. - // These are known strong primes, distributed with the OpenSSL library -@@ -228,7 +228,7 @@ unsigned char dh4096_g[] = { 0x02 }; - // - // With OpenSSL 1.1.0 is no longer possible to acess the DH p and g - // data members to set the DH params. We still use the same default --// parameters but they were converted to DER format using -+// parameters but they were converted to DER format using - // i2d_DHparams and can be restored using d2i_DHparams - - unsigned char dh512[] = -@@ -338,7 +338,7 @@ unsigned char dh4096[] = - // - // Convert a predefined parameter set into a DH value. - // --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - static DH* - convertDH(const unsigned char* buf, int len) - { -@@ -428,7 +428,7 @@ IceSSL::DHParams::get(int keyLength) - // No match found. Use one of the predefined parameter sets instead. - // - IceUtil::Mutex::Lock sync(*this); --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - if(keyLength >= 4096) - { - if(!_dh4096) diff --git a/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch b/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch deleted file mode 100644 index 149a31e..0000000 --- a/dev-libs/Ice/files/Ice-3.6.3-no-arch-opts.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- ice-3.6.3/cpp/config/Make.rules.Linux~ 2015-06-27 16:56:56.000000000 +0200 -+++ ice-3.6.3/cpp/config/Make.rules.Linux 2015-06-27 17:23:45.810591931 +0200 -@@ -79,19 +79,6 @@ - CXXARCHFLAGS += -mtune=v8 -pipe -Wno-deprecated -DICE_USE_MUTEX_SHARED - endif - -- # -- # Only use multilib -m32/-m64 options for amd64 arch, x32 arch can also run -- # in amd64 macines but doesn't use multilib, in this case MACHINE_TYPE will -- # be x86_64 and HOST_ARCH x32. -- # -- ifeq ($(HOST_ARCH),amd64) -- ifeq ($(LP64),yes) -- CXXARCHFLAGS += -m64 -- else -- CXXARCHFLAGS += -m32 -- endif -- endif -- - CXXFLAGS += $(CXXARCHFLAGS) -fvisibility=hidden -Wall -Werror -pthread - - # If MAXWARN is set then enable extra warnings ---- ice-3.6.3/config/Make.common.rules~ 2015-06-23 17:30:20.000000000 +0200 -+++ ice-3.6.3/config/Make.common.rules 2015-06-28 01:53:57.149666595 +0200 -@@ -101,25 +101,7 @@ - ifeq ($(LP64),) - LP64 = yes - endif -- -- # -- # x86 binaries build on x86_64 machine use 32 binsuffix -- # -- ifneq ($(STATICLIBS),yes) -- ifneq ($(LP64),yes) -- binsuffix = 32 -- endif -- endif - endif -- -- # -- # x86 builds uses 32 binsuffix -- # -- ifneq ($(STATICLIBS),yes) -- ifeq ($(findstring $(MACHINE_TYPE),i386 i486 i586 i686),$(MACHINE_TYPE)) -- binsuffix = 32 -- endif -- endif - endif - - ifeq ($(CPP11),yes) diff --git a/dev-libs/Ice/files/Ice-3.6.3-slice.patch b/dev-libs/Ice/files/Ice-3.6.3-slice.patch deleted file mode 100644 index fa04684..0000000 --- a/dev-libs/Ice/files/Ice-3.6.3-slice.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit c56f8ab6ca6ca0bdb9536fcce1ef24f1ef40ddc7 -Author: Benoit Foucher -Date: Mon Jun 27 17:54:30 2016 +0200 - - Refactored SSL and iAP transports, support for running SSL on top - of TCP/iAP/Bluetooth. - -diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp -index 81c335ad2d..5fe808581f 100644 ---- a/cpp/src/slice2cpp/Gen.cpp -+++ b/cpp/src/slice2cpp/Gen.cpp -@@ -2527,7 +2527,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) - } - - bool hasBaseClass = !bases.empty() && !bases.front()->isInterface(); -- bool override = p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic()); -+ bool override = !p->isLocal() && p->canBeCyclic() && (!hasBaseClass || !bases.front()->canBeCyclic()); - bool hasGCObjectBaseClass = basePreserved || override || preserved; - if(!basePreserved && (override || preserved)) - { -- cgit v1.2.3