root
12 years ago
parent
a36c426bd9
commit
ef35e4801c
@ -1,114 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-l10n/libreoffice-l10n-3.4.3-r3.ebuild,v 1.7 2011/12/18 20:46:46 halcy0n Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
[[ ${PV} == 9999 ]] && MY_PV="3.4.3" || MY_PV="${PV}"
|
||||
|
||||
RC_VERSION="rc2" # CHECK ME WITH EVERY BUMP!
|
||||
BASE_SRC_URI="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm/"
|
||||
inherit rpm eutils versionator
|
||||
|
||||
DESCRIPTION="Translations for the Libreoffice suite."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="offlinehelp"
|
||||
|
||||
LANGUAGES="af ar as ast be bg bn bo br brx bs ca ca_XV cs cy da de dgo dz el
|
||||
en en_GB en_ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km
|
||||
kn kok ko ks ku lo lt lv mai mk ml mn mni mr my nb ne nl nn nr nso oc or
|
||||
pa_IN pl pt pt_BR ro ru rw sat sd sh sk sl sq sr ss st sv sw_TZ ta te tg
|
||||
th tn tr ts ug uk uz ve vi xh zh_CN zh_TW zu"
|
||||
# Only some languages have the translations availible.
|
||||
# This is always subset of the above, so no need to add it again to IUSE.
|
||||
LANGUAGES_HELP="bg bn bo bs ca ca_XV cs da de dz el en en_GB en_ZA eo es et eu
|
||||
fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt pt_BR ru si
|
||||
sk sl sq sv tg tr ug uk vi zh_CN zh_TW"
|
||||
for lang in ${LANGUAGES}; do
|
||||
helppack=""
|
||||
langpack=""
|
||||
if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]]; then
|
||||
[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}
|
||||
helppack=" offlinehelp? ( ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_helppack-rpm_${lang2/_/-}.tar.gz ) "
|
||||
fi
|
||||
[[ ${lang} == en ]] \
|
||||
|| langpack=" ${BASE_SRC_URI}/x86/LibO_${MY_PV}_Linux_x86_langpack-rpm_${lang/_/-}.tar.gz "
|
||||
SRC_URI+=" linguas_${lang}? (
|
||||
${langpack}
|
||||
${helppack}
|
||||
)"
|
||||
IUSE+=" linguas_${lang}"
|
||||
done
|
||||
unset lang helppack langpack lang2
|
||||
|
||||
# dictionaries
|
||||
SPELL_DICTS="af bg ca cs cy da de el en eo es et fr ga gl he hr hu it ku lt mk
|
||||
nb nl nn pl pt ru sk sl sv tn zu"
|
||||
for X in ${SPELL_DICTS} ; do
|
||||
SPELL_DICTS_DEPEND+=" linguas_${X}? ( app-dicts/myspell-${X} )"
|
||||
done
|
||||
RDEPEND="${SPELL_DICTS_DEPEND}"
|
||||
unset X SPELL_DICTS SPELL_DICTS_DEPEND
|
||||
|
||||
# blockers for old libreoffice with linguas bundled
|
||||
RDEPEND+="
|
||||
!<=app-office/libreoffice-3.4.3.2
|
||||
!=app-office/libreoffice-3.4.9999
|
||||
!=app-office/libreoffice-9999
|
||||
!<=app-office/libreoffice-bin-3.4.3-r1
|
||||
"
|
||||
|
||||
RESTRICT="strip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_unpack() {
|
||||
default
|
||||
|
||||
local lang dir rpmdir
|
||||
|
||||
for lang in ${LANGUAGES}; do
|
||||
# break away if not enabled; paludis support
|
||||
use_if_iuse linguas_${lang} || continue
|
||||
|
||||
dir=${lang/_/-}
|
||||
|
||||
# for english we provide just helppack, as translation is always there
|
||||
if [[ ${lang} != en ]]; then
|
||||
rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_langpack-rpm_${dir}/RPMS/"
|
||||
[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
|
||||
# First remove dictionaries, we want to use system ones.
|
||||
rm -rf "${S}/${rpmdir}/"*dict*.rpm
|
||||
rpm_unpack "./${rpmdir}/"*.rpm
|
||||
fi
|
||||
if [[ "${LANGUAGES_HELP}" =~ "${lang}" ]] && use offlinehelp; then
|
||||
[[ ${lang} == en ]] && dir="en-US"
|
||||
rpmdir="LibO_${MY_PV}${RC_VERSION}_Linux_x86_helppack-rpm_${dir}/RPMS/"
|
||||
[[ -d ${rpmdir} ]] || die "Missing directory: \"${rpmdir}\""
|
||||
rpm_unpack ./"${rpmdir}/"*.rpm
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
src_prepare() { :; }
|
||||
src_configure() { :; }
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2 ${MY_PV})/basis$(get_version_component_range 1-2 ${MY_PV})/
|
||||
# Condition required for people that do not install anything eg no linguas
|
||||
# or just english with no offlinehelp.
|
||||
if [[ -d "${dir}" ]] ; then
|
||||
if [[ ${PV} == 9999 ]]; then
|
||||
# Bump me when it gets slotted ; also do revision bump
|
||||
insinto /usr/$(get_libdir)/${PN/-l10n/}/basis3.5/
|
||||
else
|
||||
insinto /usr/$(get_libdir)/${PN/-l10n/}/basis$(get_version_component_range 1-2)/
|
||||
fi
|
||||
doins -r "${dir}"/*
|
||||
fi
|
||||
}
|
||||
@ -1,82 +1,12 @@
|
||||
DIST 09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt 6144654 RMD160 f9bf3fc5a078f4cd357f766c3e750dcf05407a2d SHA1 42c9235d7f876645ea6553770e7572c1b0b8609a SHA256 4b069e14609440d1743f4f898040aa6ffa12699ce1882a3f98e984facc1835d8
|
||||
DIST 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz 376068 RMD160 b6c1b121ea1b3b1386a188e9f425a7288b1de865 SHA1 c67f67b4b8ae46ef94bc8c09dc29ff66d5796d37 SHA256 585c15b3b9ae0f3562d0aa35e15406adfd75357087d93009d4fa4ae034c6e983
|
||||
DIST 128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz 540999 RMD160 2058bab6642460fdaee13993dd05da29aa516efa SHA1 e98d7149d6a20fdbb58cc0b79cb5e3f95ae304e4 SHA256 5677badffc48a8d332e345ea4fe225e3577f53fc95deeec8306000b256829655
|
||||
DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 RMD160 8b25da02fbc2702a43cc88b0af8eaeb41c0f75a0 SHA1 7168b0f40aa5c72267899601c116d2348d2f56ec SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
|
||||
DIST 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz 315122 RMD160 e99bb5017c29657c3303d8810e21bf02d737c345 SHA1 28d4ec24dfda4eb41b6ceaa0cfcfca41b578f3b3 SHA256 6e6c53064ef6f40891ad72c06fab9f3c8fdcda80e03c9d0b21244cb1d4bf030b
|
||||
DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 RMD160 40a15ad43e92335558c868d66bca521e57d8c583 SHA1 0619ed3a89644bef318df67db12045b2b590585b SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
|
||||
DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 RMD160 6056046e4043e3e6a613029fe94f5f1728bebcd5 SHA1 8f949ae74a6d66278a595bd063f13e0ad196d14a SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a
|
||||
DIST 24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html 20335 RMD160 b74ae68c08ef3bc579407337e2f4f527c4754d9c SHA1 f07e5f2744ebf5a5d1018f77b312a50bfd06a006 SHA256 71730ed23e9f00e7b93bc78538bbf7750be501f149bf04d1289c83cb222a2708
|
||||
DIST 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz 3568559 RMD160 5b7c679ca59540a19cfabb22b923f11d77da84c0 SHA1 32d2298c78132a629ed2ac6c9830b4d52770ce02 SHA256 556921bf0de5c508985c95eef77b73a4388a7da1b7e703060c79c58385483bf4
|
||||
DIST 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip 1180582 RMD160 cf09fd0e4911275fddac1779cdbcfc6a7769eb5c SHA1 3232dd31859be4f7eb443c33e8e3287f394789a0 SHA256 5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
|
||||
DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 RMD160 687165fa06edad490e6173f3b868e1e1afdfc2c9 SHA1 1acea86fd399ed7817879d36370d3d1f8b109050 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
|
||||
DIST 35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip 867405 RMD160 83ada665ea92bd70cd8e9c73f0921e5790d6d9f1 SHA1 b67507ea7a48f7b68075cdfb2384784e516cb8ca SHA256 f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b
|
||||
DIST 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 153157 RMD160 0e6a6f183b1aafa43635ed9dfb74fc76761e65b4 SHA1 b92930010622906778f713fb8f0153fa0683d018 SHA256 085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
|
||||
DIST 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip 5750610 RMD160 229deeb4c533422466c16eaf490c08103be21fc8 SHA1 e393beea80d36ff27b732882c706826988a64f5c SHA256 e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
|
||||
DIST 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt 42487 RMD160 89a3237235bbdb473f6dc8dc1e90e996aefacdde SHA1 e38bfefa6b747db13182e4ea5c1ad2eed3fa9cda SHA256 34a9812ae426dbca696fbd069276094517da0df78b5afb95a87b1c2daef97adb
|
||||
DIST 472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt 4998642 RMD160 61bbecc48c94393b9c04fa9c11282dd55d42a871 SHA1 d2b6a076b40d8d517075e52220ddd8f89f655c8f SHA256 f15b13b947d8690bf05c4dc4cb04ab89297565ccddf02cce37b831376151ba29
|
||||
DIST 47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 14952999 RMD160 e807b51c007a80de843566c47f16149afeb03a5e SHA1 19bdd1cabba599e5b0ed6fb0efc446e860e021b0 SHA256 8da587c6870bb35719c64c5973cafe1ce3f834fb33f343d2293a56a58bf1ef1b
|
||||
DIST 48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt 441 RMD160 db97e6581e875ede8cf895a63d2c689f1eae667f SHA1 60bca1db80e8cb5bd1621f79350b26a3a10360b2 SHA256 4745d5b571c79e1323044893f408d675527b4f641def3f2c2b204b5997604484
|
||||
DIST 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz 22508 RMD160 08682935b555027eb032a212accb2284ce93d645 SHA1 b8ecfaee8aef693817f0ebc12a2e932ac9467776 SHA256 799682f52182fa8295227731b4efad639413f82c1950a6459047477000f2a619
|
||||
DIST 4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt 4973419 RMD160 1f01d5f4d8be121bc3aaa5c5d69c9bbb50cfd912 SHA1 bf25bef71f72a4622089c85958bfd6c58d8516a6 SHA256 4eb76551b548c0e7fdc5048be8462ddb61dfb7bba4bbc23b46189356b4b0976c
|
||||
DIST 53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt 4953938 RMD160 cf457953fd947bf7f60274377ef88124bb788108 SHA1 4fea33622d89c7ac62053e5ee3616cfe504e0f14 SHA256 2f0ac09043abf098335ca1aa4c8bdd1759a0fea6dea561d9a21cfa0d606378dc
|
||||
DIST 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz 7194574 RMD160 90c028196852e7e6a1b2dcf8647b88eeb232f0b9 SHA1 b97bfb0e3e32f4e4857847d5fb5658202b730e62 SHA256 0647e762eb3c31f871c3d056fb7c907b2917a5b183580d434f15b2d9e0047791
|
||||
DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 RMD160 68e248ec03675458f0536282ef250efa42c4c154 SHA1 8a90669029e107b61953b90ba11545fef586c2ca SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
|
||||
DIST 8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar 56041 RMD160 fbf2fc7ec950ac7282b50ee5fbe0d9c9426c1894 SHA1 72a838242dfe8089fbe08e143bbe28a19a0fa396 SHA256 deb9897f2c48a8c921bec4d72a98b506d86f3a69e35d9439e0896ca8ee1a8563
|
||||
DIST 881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip 4001063 RMD160 530969ea625e7c7c2b8f8336a6d69a960ba3b31f SHA1 704c90532c96c460c9fb0ca0a4b41561dd958dcb SHA256 4a9c251e8ee02295fdba9d988863f19ee13ee56b9bc2aa4c16411f414ad09ab5
|
||||
DIST 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip 762419 RMD160 3235b45b4065750b0b2df4735a57ca1f815dfc69 SHA1 a637c0c3ad3be32d6814972e1c45e547c5f6359d SHA256 abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
|
||||
DIST 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 64057 RMD160 f2ca02c3bbd8e6787284420f8cb9364c6d5746cf SHA1 02e9cca05a9a3b6da59236c6801c186c07c311f3 SHA256 f0ff752a2c82548b02d8edeeaffbe9f276f4b8c509fdb909d3b7e2a71beb8cc3
|
||||
DIST 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip 2938721 RMD160 61672340e92957a5b72cddddcfcbf56d9602842c SHA1 47b58e0ef2d856df26372a7061ae43fae6e08051 SHA256 3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
|
||||
DIST a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt 4971243 RMD160 40f8e190cedca8706d9ac44316a076aad33b8b42 SHA1 d831314cf4c74f5afb3b37ee718dd58f981b97a8 SHA256 472c724cf6190465ee5922536d2b1f7754478ecb9661a00f63fb2082b1aed859
|
||||
DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 RMD160 923870cf88023713a492e0a5c5d5707ec21d8739 SHA1 2d49e11b0b711970f494294dc3698f05eb294853 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
|
||||
DIST ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip 2732347 RMD160 28bdf89bab559d82d82c75f6a339b5351ee06f48 SHA1 528dc8fa11343fa2a5d584dd2f8d5e2238ed78ba SHA256 64f8d737c32756713d60c22efe3978a59fa167cdeaa2d3d0a1646b1f2232b825
|
||||
DIST b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt 4961173 RMD160 d90425d5485f1607ebdd3bd7b1a99b6365c3097d SHA1 27847d6c320297905303ca7d2a45dbd0c492f705 SHA256 fd6962d40e68494f91474c77d001603c95b04f543434141de9c3f395d795f6a4
|
||||
DIST b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 11922684 RMD160 70435964d18c4b3c633dd50225c177ca4546269a SHA1 4ad95f5d07eae50dc4f95b04eb900c39e202fd21 SHA256 2c3ed36476e1279ba35d7c675961bfa9c40b1360153472e80508a99963c8d46c
|
||||
DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 RMD160 ecf14c46ddf095734752ef260134c97b1772be57 SHA1 1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b SHA256 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
|
||||
DIST bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz 762803 RMD160 c5f38b1d201afcba7913f2b53fb7558add3d21f5 SHA1 f1ab8986af7a1ffa6760f4bacf5622924639bf4a SHA256 ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a
|
||||
DIST d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip 764464 RMD160 5f7f24ab86a2b1d051dfd775b66c7681c212be6a SHA1 626731cb89e69d864d0f52a571f71f44d90db394 SHA256 c8e14bb686e113b126dc802d922fbafcf8fca592ea230ffc07c4672a3ab0a979
|
||||
DIST d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip 207563 RMD160 d5b50ff1bcb09efd7c1f4167f2d0d38065ba0166 SHA1 3478ebc27bb76025f4b5c2ae6a9bac6090e2cb09 SHA256 1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
|
||||
DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 RMD160 a2776747753219a110e8d5b39939d0914cfec37d SHA1 908c4053f8f4e6214426a41b1e4134e7bc86098e SHA256 dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941
|
||||
DIST eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 427800 RMD160 99ddfde4ffb6a76f1bf796dd26c0b10e45d8ddea SHA1 43a7ff11dd15370d456b20a093e1ee81279163a0 SHA256 75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
|
||||
DIST f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip 211919 RMD160 575a7daf02efbab9ea972e03a6870f7f13112806 SHA1 5ecb895ffc1eff2c381fa78d2197d0c57422b3df SHA256 05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
|
||||
DIST fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz 547217 RMD160 6443438ddf0bb5cd277c96108aa2671213edf8df SHA1 6e836945719e137596df1ca82f0afa809e8a2e88 SHA256 e6bcbfc521d23899511799c912ce21fbc003d55c3d56408e3c8dabf20fea8256
|
||||
DIST libreoffice-artwork-3.4.3.2.tar.bz2 13537796 RMD160 26c74962452a3be0258f9417bea66c50b9e9fc80 SHA1 a42d6a44c3b3605cea49c66162507adec5c1f246 SHA256 6b700d41c593d2befcd85fe497d4a6e96db3b7e1639921674ae238022d1ea743
|
||||
DIST libreoffice-artwork-3.4.5.2.tar.bz2 13537659 RMD160 8e5417f4c8f05bca842cddb7384b2b3bdd941cb7 SHA1 fed4688e3ecdf44b760a27f4edd11630ba99adfd SHA256 382c746c92988041010d521fd5969c013ff8b31233900062dff729c0a50d7107
|
||||
DIST libreoffice-base-3.4.3.2.tar.bz2 2068714 RMD160 c689762bd2a5a6bc46efe701c85b798bd01ef248 SHA1 88f1531b11ac49f8bd9c0e70e08b38a7b0aae411 SHA256 93fc103b376a2575efe8b35d64861236e63025b9d3415cee35d845ada7589dfa
|
||||
DIST libreoffice-base-3.4.5.2.tar.bz2 2070005 RMD160 432cb53d1becd8e3ebf371f3224afa57899fe71e SHA1 d07f93434055981a9c320912b24966c322b9d536 SHA256 9f9b7ae788a8249ccbcaca0ba2155cd91f76367cbaf3e1ad063f8e61b3d7b938
|
||||
DIST libreoffice-binfilter-3.5.2.2.tar.xz 5979532 RMD160 104eb7ef0c53700b664d7cae871d96ac9cd2a286 SHA1 feeaa103adf07f9eb5578f4073a8a464b2abadfd SHA256 aadccf388989331d0738059e6fd0c70b9fb48bb6ca622a243365d8253b1a4b30
|
||||
DIST libreoffice-bootstrap-3.4.3.2.tar.bz2 2711992 RMD160 5ded24c90e34306a0ae0d5d97578638098879351 SHA1 527db77912dd3c5f41916ad0db8405325f37c621 SHA256 18f253da00974958059dc91ddb17d5ce5c6c41ec48b98f43451609fb2b1faa45
|
||||
DIST libreoffice-bootstrap-3.4.5.2.tar.bz2 2715464 RMD160 d2b2fadac07507878a6bbed9801384dc25f4e874 SHA1 cc5c1ceb6ae9525a8ee89c0b08da958a420e85c0 SHA256 a9a3f223046d57002f0b76b0c04c07398a77bbc85acb445faea6e6d6a637bf17
|
||||
DIST libreoffice-binfilter-3.5.3.2.tar.xz 5979484 RMD160 48a65d7d3b5f7de01ee4e2d74a1ba2a3ec29805a SHA1 b499371af021ee59622d179c3a32dc736611653d SHA256 332344f8b8241e30ef31fc2f4ed24b2b1b2d252a7eae64cd9709fd1a7c7da847
|
||||
DIST libreoffice-branding-gentoo-0.4.tar.xz 130792 RMD160 39c693e84e13d7199f9505b5616cffd5b7072d3b SHA1 e12d41b67b75f3507b86d12b3c182195269d6210 SHA256 9a870560cd470234039ab136c1bb023a0da3fa8d0ffa4f6770b830fec707fc9a
|
||||
DIST libreoffice-calc-3.4.3.2.tar.bz2 9521313 RMD160 3233a1d112fdb581121ac5f41f3493906eae7863 SHA1 03028d84c98c35a068f0edd3f65556cc5be80f53 SHA256 05f543b5a47511f789cd30fc74ba31cdd0074a4fe7a9bc91e9dd5ab969583335
|
||||
DIST libreoffice-calc-3.4.5.2.tar.bz2 9519567 RMD160 25114e5c9d2206879c4a89360a1fa74d84f71444 SHA1 400e1b7c34e91b9a87391464b1968007d3acc378 SHA256 31f94e9cfca6edc17e62d822349ed5bda8fed93af83c5c651835e92031f000d0
|
||||
DIST libreoffice-components-3.4.3.2.tar.bz2 5094591 RMD160 ab3a2cd16340931a124e3d0e783c938a5357f5f9 SHA1 492a0b25128a34c4d75df5ef7b3b5e997c24cf31 SHA256 572fdbff98c1083e5066b15cbc34453cedf7f6ac5a740c07639ef2e65fd61aa7
|
||||
DIST libreoffice-components-3.4.5.2.tar.bz2 5089571 RMD160 c3b01fdb7cf81ae01dc41dc44333e68822423682 SHA1 888f3c77f7c3fd62fcfc0d8eca182de55dfd56f5 SHA256 a2c0f819ca06c6fd82645920cdfb5c614dadcbd934a11864e706806e00f506eb
|
||||
DIST libreoffice-core-3.5.2.2.tar.xz 103296172 RMD160 8e1b87e2ea35683ee31e0a2b209d85f14ba85753 SHA1 ab0cfa84a11ec4d18afe7095235a4b4c904e9649 SHA256 df681145f7f1dda30e3f82d4924722957662d744df0e7b6fa024b2bd53fb3dc6
|
||||
DIST libreoffice-extensions-3.4.3.2.tar.bz2 4216448 RMD160 07932f5fa49cf32a0efda440cdb074c6ade97f35 SHA1 ca3257362b8b861e7358afe11bc0831739c83f41 SHA256 91ab0d29057c09026ddb380d530ef0656e48b7c558eb2be7a0c4c4f1b793029d
|
||||
DIST libreoffice-extensions-3.4.5.2.tar.bz2 4219897 RMD160 c641e4530360ac6eb02c570469a7c675f620ba0c SHA1 cf6fe1fa7fcd0f4f7f79fe6b318c90ef510b6103 SHA256 ff6c6bbc78e21277a10fdf3e3feddb425368621f7aa2fd288738d19d609ab0a3
|
||||
DIST libreoffice-extras-3.4.3.2.tar.bz2 38643532 RMD160 e366822a0a56d130c0b99258ef52934a16fdc67a SHA1 3d532cb1d261306e0a83a213099779042f57a8c4 SHA256 3f4fe22ddf23e9e368e9145fd00cf9bc6de6e19539dfc1f818fde93426fda159
|
||||
DIST libreoffice-extras-3.4.5.2.tar.bz2 38643665 RMD160 e45107602eac56b5dc3ee1842c668abc1a8bcfcb SHA1 9d53b582533eb3f883f51ca3e39a4183bfce1dc5 SHA256 5b225c6efa62c3f4b929def8345e9dc3b8a72a48e885a89593f743a32c18b57f
|
||||
DIST libreoffice-filters-3.4.3.2.tar.bz2 11779881 RMD160 f5bf02edb2dc127b95de13d08af27d9d6643117c SHA1 4257c992742e3f2e346082f61dac86883576691b SHA256 2a12e9afa38f8d82419418c4c7443e47cc3cc39f78d5c2dc22bc61123b35dbe1
|
||||
DIST libreoffice-filters-3.4.5.2.tar.bz2 11780568 RMD160 ed09717dbe24763e1dd1bd2754dc4b681df8a223 SHA1 c075577eff89b68aa32d70d847ef9cf2052997ae SHA256 86d075b12f55c44fcd42e8ee8579da886feb887a2660953503a3a4b115ee5800
|
||||
DIST libreoffice-help-3.4.3.2.tar.bz2 1846706 RMD160 dd5fe51add1393c0c4f14e3a77aa88abffcf33ef SHA1 c80b24bb4e0cbbd62df05445ff56ecff66bee892 SHA256 013a21f3a22e39782af784213efda43ebe4f38882932267b009ec745f32cff23
|
||||
DIST libreoffice-help-3.4.5.2.tar.bz2 1845841 RMD160 c6cdbfc1076db6e3bd8ee108292bd08f41d7408f SHA1 c1328f46ce0a2618c09ee89cd288f6139e5c658f SHA256 186b9cc154d19f600ea314f37ffebd00922e69c07818aea5f0bab671fec7faa9
|
||||
DIST libreoffice-impress-3.4.3.2.tar.bz2 2651830 RMD160 b0c30c2981eede69ae7236887fda5ab6de74dca1 SHA1 4ec720570088250d49ddce1fde3b5d9248c8a67c SHA256 09114924804a876d41f971cfd6a2bf440df8ff79c97ebfe6698e74e7d39d87c0
|
||||
DIST libreoffice-impress-3.4.5.2.tar.bz2 2651854 RMD160 7c9ee52c0669cc068e0ebed0fb640ecdca280d5e SHA1 b0457d737d153ef02ac01b477526580316b22779 SHA256 0391df3e70b947804a0cdbb638ab61f09a934ac58f7c90a972b31dca495f6a47
|
||||
DIST libreoffice-libs-core-3.4.3.2.tar.bz2 15592792 RMD160 16745ba1a1e61c84e26a770aa280ad2d4f0778df SHA1 ae65769b646b29b1cbaa69218ca016dea5f66bec SHA256 714001111ffacd69485676bec34d35a42e7440fe0b166cb5268e74d5ee32c858
|
||||
DIST libreoffice-libs-core-3.4.5.2.tar.bz2 15596849 RMD160 7f5c3cf297bd78928553f82917e79591934049ce SHA1 847909218c90e91529c95b9592e5a6d0d4f93090 SHA256 8bec5d81989bb9fe5d9e88252666d91c106b6ac334cb3c638f31140751699c2e
|
||||
DIST libreoffice-libs-extern-3.4.3.2.tar.bz2 637830 RMD160 ae5410966d86831f4d4ac1dcf42842bc7f98e9dc SHA1 23144f3cc33717e44d2f4caf06c5ca351f724bdf SHA256 681316cafbff67093ac93fa3803117219e80e3d3191c312f53129cf1a0e159c8
|
||||
DIST libreoffice-libs-extern-3.4.5.2.tar.bz2 638269 RMD160 e3d173ce2047fa418d7a4fbf27ee64cd2490abeb SHA1 f64b87e653d598b208244df937575ce556a68da4 SHA256 7ae02ea50b8b8325778e01633c2d148a074f05ad5f4713d13a0a01e9a41b9505
|
||||
DIST libreoffice-libs-extern-sys-3.4.3.2.tar.bz2 40030519 RMD160 d3fddb187baf995ab5a3bd6d998c9d6ff6115db1 SHA1 242fb62a076edd1cbbf8ed6ad58e438cdd4cd687 SHA256 d6086fac838167c733e135ecde70807ade4bed21687d6740d2d7a66ca7ee84ee
|
||||
DIST libreoffice-libs-extern-sys-3.4.5.2.tar.bz2 40048456 RMD160 112147769cf60649a3091d336d023d267b83be8c SHA1 fe030d389eade869dfaca405b9c3ee20569577e1 SHA256 0052c8879f61404725e05cc22782984adb69328f1f6ff75384ed426aabb14894
|
||||
DIST libreoffice-libs-gui-3.4.3.2.tar.bz2 10866411 RMD160 7f181ae1c1529963045b3d38002c46aa7d61742e SHA1 1bcdc59d55aab2023dc3242e32b5bdd1cb0a5ffb SHA256 9ae7e7092f4055bab2f3285cbfc388730caa91ab38af4307482906bd6c983ab6
|
||||
DIST libreoffice-libs-gui-3.4.5.2.tar.bz2 10866264 RMD160 6557e8d0e9dc451cd70e8764cf444eb7760fe8e0 SHA1 36a6a0d5222676f46242636ea713e15e09066af5 SHA256 99c18b9b9e7ff3ac99cd918dd238e9874781b432bc19d279766b4a2fa2463672
|
||||
DIST libreoffice-postprocess-3.4.3.2.tar.bz2 50913 RMD160 3a7b1976272fdcc5f209354effb89ca9c7e43b8c SHA1 fda94d598ac5e0f286b3ff43f290e151f5fd5389 SHA256 5066d9c3dc631e182f150c372a806b30f5428d39c7d7358a4beeec3f8065e6c2
|
||||
DIST libreoffice-postprocess-3.4.5.2.tar.bz2 50952 RMD160 a7795b898bf007f251df25e44c374bea89b2449f SHA1 26ba7ecd2cc36b741bee963b56640659ca41c63f SHA256 d7badba4b2c5bdc93b4aab62232c027c9f60f9e2a7a1ee5a1e72bbdc82c757e7
|
||||
DIST libreoffice-sdk-3.4.3.2.tar.bz2 1721285 RMD160 beb624a2bac03cf546c371c7356bdb7af8e68d52 SHA1 5859c05f15497c7b9539e43138bcd706a418b140 SHA256 fa540938fd9526bd242c2e46db813f679a0261914e4feed214763618f82ab34a
|
||||
DIST libreoffice-sdk-3.4.5.2.tar.bz2 1720970 RMD160 3cb67cc0673fc7b29abd4d4eb7173e7a87bd643b SHA1 c8d520904cb8c0756ce0d878b5d4bbd0af1735b8 SHA256 fce5074dee1c50f3f93886caac62c2f711d17798b110fa088b3a71550eda31b9
|
||||
DIST libreoffice-testing-3.4.3.2.tar.bz2 50848140 RMD160 a1b8b62e173230f2fde2654c70f6b439cdbec68a SHA1 a3102c3c46a30a1cdbf5e032ea9182ef688dea7c SHA256 89c25311bed6d9d8646bd0f8e7f37a9c227b125309cf7b49f2ab083a8b73d6c0
|
||||
DIST libreoffice-testing-3.4.5.2.tar.bz2 50846799 RMD160 0c5e26d1384aaaabd1443831ca5ec1b7cad17711 SHA1 b5b9fd86cd8350007146134a76a88cfb96b27b9c SHA256 18290afb6de88243fbe198c0bae7dcbac2ac4e1459332bc4d9b23e59221d5317
|
||||
DIST libreoffice-ure-3.4.3.2.tar.bz2 6214027 RMD160 188aa9c9621fa03d4af10832fc25fb80a2071c65 SHA1 d0dcf8531274cc80ca0104517b78dfbac148031f SHA256 9150a51fe93b803be51af02be585c8e9b2e2fce7c6a4061ed9b8c5d60183ca20
|
||||
DIST libreoffice-ure-3.4.5.2.tar.bz2 6215972 RMD160 873fbcde60e680f743449ac30fdc7c50528fe486 SHA1 9241f407314a1d24cae4603e825c57c1820ec290 SHA256 fe5780496381255bf330d53ddc0d7fcf76ade5ec0f2bd5d5c7d60facd633e071
|
||||
DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6addb59fee22ace29 SHA1 57a549b811c0b95898a9532968ce4a9f6fc33f16 SHA256 65fdcb132a84fae9f4ec0d84501f13ada3861fbd7646947ad0cea495b637be9a
|
||||
DIST libreoffice-writer-3.4.5.2.tar.bz2 7299202 RMD160 e0cc1509efa4f28350e82ce1de3b64322482c80b SHA1 277b886e63383cc37cead0deb6b1e02b40cfc9d0 SHA256 b0d34950f06de4fbf2b1ba40b1ddece0cb3d28bc23fca0edfd6daba54872fd4c
|
||||
DIST libreoffice-core-3.5.3.2.tar.xz 103327220 RMD160 cb084b763e6a8136ab23f368b7fc44a911ee2744 SHA1 33bdaec948367c5b06c2b6a7c39ceaa865abe28d SHA256 182a1dadbf4ed7dc758466aa4f1c2ee79dbc57d65ba94872fa6aaeef3f3847ad
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
--- ucb/source/ucp/webdav/NeonSession.cxx
|
||||
+++ ucb/source/ucp/webdav/NeonSession.cxx
|
||||
@@ -253,9 +253,6 @@
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
extern "C" int NeonSession_NeonAuth( void * inUserData,
|
||||
-#ifdef NE_FEATURE_SSPI
|
||||
- const char * inAuthProtocol,
|
||||
-#endif
|
||||
const char * inRealm,
|
||||
int attempt,
|
||||
char * inoutUserName,
|
||||
@@ -322,14 +319,6 @@
|
||||
|
||||
bool bCanUseSystemCreds = false;
|
||||
|
||||
-#ifdef NE_FEATURE_SSPI
|
||||
- bCanUseSystemCreds
|
||||
- = (attempt == 0) && // avoid endless loops
|
||||
- ne_has_support( NE_FEATURE_SSPI ) && // Windows-only feature.
|
||||
- ( ( ne_strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) ||
|
||||
- ( ne_strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) );
|
||||
-#endif
|
||||
-
|
||||
int theRetVal = pListener->authenticate(
|
||||
rtl::OUString::createFromAscii( inRealm ),
|
||||
theSession->getHostName(),
|
||||
@ -1,11 +0,0 @@
|
||||
--- sal/qa/osl/security/osl_Security.cxx.orig 2011-02-24 19:36:38.704013640 +0100
|
||||
+++ sal/qa/osl/security/osl_Security.cxx 2011-02-24 19:38:50.580013586 +0100
|
||||
@@ -342,8 +342,6 @@
|
||||
CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::logonUser);
|
||||
CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserIdent);
|
||||
CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserName);
|
||||
-CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHomeDir);
|
||||
-CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getConfigDir);
|
||||
CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::isAdministrator);
|
||||
CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHandle);
|
||||
CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::UserProfile);
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/configure.in b/configure.in
|
||||
index f7ee08f..dab9503 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -9155,7 +9155,7 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
|
||||
# check if either class-path entry is available for hamcrest or
|
||||
# it's bundled
|
||||
if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |grep -q hamcrest || \
|
||||
- "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep -q 'Class-Path: hamcrest'; then
|
||||
+ "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep 'Class-Path:' | grep -q 'hamcrest'; then
|
||||
AC_MSG_RESULT([$OOO_JUNIT_JAR])
|
||||
else
|
||||
AC_MSG_ERROR([your junit jar neither sets a classpath nor includes hamcrest; please
|
||||
@ -1,35 +0,0 @@
|
||||
From 14dfa9de27ddab9bb0bbe64e6c0a4b5e4caab742 Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
Date: Thu, 8 Mar 2012 14:15:09 +0100
|
||||
Subject: [PATCH] yet another clash with macro name
|
||||
|
||||
Signed-off-by: Tomas Chvatal <tchvatal@suse.cz>
|
||||
---
|
||||
fpicker/source/unx/kde4/KDE4FilePicker.cxx | 4 ++++
|
||||
1 files changed, 4 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||||
index 69be3b1..9c3ded3 100644
|
||||
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||||
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||||
@@ -60,6 +60,8 @@
|
||||
#undef SETTINGS_MOUSE
|
||||
#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
|
||||
#undef SETTINGS_LOCALE
|
||||
+#define LO_SETTINGS_STYLE SETTINGS_STYLE
|
||||
+#undef SETTINGS_STYLE
|
||||
|
||||
#include <kfiledialog.h>
|
||||
#include <kwindowsystem.h>
|
||||
@@ -77,6 +79,8 @@
|
||||
#undef LO_SETTINGS_MOUSE
|
||||
#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
|
||||
#undef LO_SETTINGS_LOCALE
|
||||
+#define SETTINGS_STYLE LO_SETTINGS_STYLE
|
||||
+#undef LO_SETTINGS_STYLE
|
||||
|
||||
using namespace ::com::sun::star;
|
||||
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
diff -urN libreoffice-bootstrap-3.4.2.3.old/configure.in libreoffice-bootstrap-3.4.2.3/configure.in
|
||||
--- libreoffice-bootstrap-3.4.2.3.old/configure.in 2011-08-03 22:11:11.000000000 +0200
|
||||
+++ libreoffice-bootstrap-3.4.2.3/configure.in 2011-08-03 22:13:55.000000000 +0200
|
||||
@@ -6878,10 +6878,10 @@
|
||||
KDE_HAVE_GLIB=""
|
||||
if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
|
||||
qt_incdirs="$QT4INC /usr/include/qt4 /usr/include $x_includes"
|
||||
- qt_libdirs="$QT4LIB /usr/lib $x_libraries"
|
||||
+ qt_libdirs="$QT4LIB /usr/lib/qt4 /usr/lib/qt /usr/lib $x_libraries"
|
||||
|
||||
- kde_incdirs="/usr/include $x_includes"
|
||||
- kde_libdirs="/usr/lib $x_libraries"
|
||||
+ kde_incdirs="/usr/include /usr/include/kde4 $x_includes"
|
||||
+ kde_libdirs="/usr/lib /usr/lib/kde4 $x_libraries"
|
||||
|
||||
if test "$host_cpu" = "x86_64" ; then
|
||||
qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
|
||||
@ -1,65 +0,0 @@
|
||||
From 16d4258863c936538ef3b7ff13a95f7567a62044 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
|
||||
Date: Mon, 1 Aug 2011 17:41:29 +0200
|
||||
Subject: [PATCH] Fix segmentation fault when linking -mavx on new CPUs is enabled by explicitly adding -mno-avx to CXXFLAGS.
|
||||
|
||||
---
|
||||
.../source/cpp_uno/gcc3_linux_intel/makefile.mk | 6 ++++++
|
||||
.../source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 6 ++++++
|
||||
bridges/source/cpp_uno/mingw_intel/makefile.mk | 6 ++++++
|
||||
3 files changed, 18 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
|
||||
index beedf9d..609e09a 100644
|
||||
--- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
|
||||
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
|
||||
@@ -52,6 +52,12 @@ CFLAGS += -DLEAK_STATIC_DATA
|
||||
# work with the .cxx sources in this directory:
|
||||
CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
|
||||
|
||||
+# In case the compiler supports AVX this code segfaults so specifically turn
|
||||
+# it off.
|
||||
+.IF "$(HAVE_GCC_AVX)" == "TRUE"
|
||||
+ CFLAGSCXX+= -mno-avx
|
||||
+.ENDIF
|
||||
+
|
||||
CFLAGSNOOPT=-O0
|
||||
|
||||
SLOFILES= \
|
||||
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
|
||||
index dd35432..e519105 100644
|
||||
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
|
||||
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
|
||||
@@ -52,6 +52,12 @@ CFLAGS += -DLEAK_STATIC_DATA
|
||||
# work with the .cxx sources in this directory:
|
||||
CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
|
||||
|
||||
+# In case the compiler supports AVX this code segfaults so specifically turn
|
||||
+# it off.
|
||||
+.IF "$(HAVE_GCC_AVX)" == "TRUE"
|
||||
+ CFLAGSCXX+= -mno-avx
|
||||
+.ENDIF
|
||||
+
|
||||
SLOFILES= \
|
||||
$(SLO)$/abi.obj \
|
||||
$(SLO)$/except.obj \
|
||||
diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk
|
||||
index 2c7a8da..d2b0809 100644
|
||||
--- a/bridges/source/cpp_uno/mingw_intel/makefile.mk
|
||||
+++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk
|
||||
@@ -51,6 +51,12 @@ CFLAGS += -DBROKEN_ALLOCA
|
||||
# work with the .cxx sources in this directory:
|
||||
CFLAGSCXX += -fno-omit-frame-pointer
|
||||
|
||||
+# In case the compiler supports AVX this code segfaults so specifically turn
|
||||
+# it off.
|
||||
+.IF "$(HAVE_GCC_AVX)" == "TRUE"
|
||||
+ CFLAGSCXX+= -mno-avx
|
||||
+.ENDIF
|
||||
+
|
||||
NOOPTFILES= \
|
||||
$(SLO)$/uno2cpp.obj
|
||||
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
--- libreoffice-libs-core-3.4.2.3.old/sfx2/Library_qstart.mk 2011-07-27 23:18:49.001531376 +0000
|
||||
+++ libreoffice-libs-core-3.4.2.3/sfx2/Library_qstart.mk 2011-07-28 15:23:32.752723654 +0000
|
||||
@@ -56,8 +56,11 @@
|
||||
$(filter-out -I%,$(GTK_CFLAGS)) \
|
||||
))
|
||||
|
||||
+NO_AS_NEEDED=-Wl,--no-as-needed
|
||||
+
|
||||
$(eval $(call gb_Library_set_ldflags,qstart_gtk,\
|
||||
$$(LDFLAGS) \
|
||||
+ $(NO_AS_NEEDED) \
|
||||
$(GTK_LIBS) \
|
||||
))
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 7f54882a2b2a769a49d539fac0922320de51c848 Mon Sep 17 00:00:00 2001
|
||||
From: Petr Mladek <pmladek@suse.cz>
|
||||
Date: Mon, 1 Aug 2011 21:16:58 +0200
|
||||
Subject: [PATCH] fix build with -Wl,--no-as-needed
|
||||
|
||||
---
|
||||
binfilter/filter/source/bf_offwrp/makefile.mk | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk b/binfilter/filter/source/bf_offwrp/makefile.mk
|
||||
index d65beed..0545931 100644
|
||||
--- a/binfilter/filter/source/bf_offwrp/makefile.mk
|
||||
+++ b/binfilter/filter/source/bf_offwrp/makefile.mk
|
||||
@@ -52,7 +52,6 @@ SHL1STDLIBS= \
|
||||
$(BFSVTOOLLIB) \
|
||||
$(BFOFALIB) \
|
||||
$(VCLLIB) \
|
||||
- $(SOTLIB) \
|
||||
$(SALLIB) \
|
||||
$(TOOLSLIB) \
|
||||
$(CPPULIB) \
|
||||
@@ -64,6 +63,7 @@ SHL1STDLIBS= \
|
||||
$(BFSCLIB) \
|
||||
$(BFSVXLIB) \
|
||||
$(BFSO3LIB) \
|
||||
+ $(SOTLIB) \
|
||||
$(UNOTOOLSLIB) \
|
||||
$(COMPHELPERLIB) \
|
||||
$(LEGACYSMGRLIB)
|
||||
--
|
||||
1.7.3.4
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 65813cb..bfa612c 100755
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -1984,6 +1984,41 @@ if test "$GCC" = "yes"; then
|
||||
fi
|
||||
AC_SUBST(HAVE_LD_BSYMBOLIC_FUNCTIONS)
|
||||
|
||||
+dnl Check for AVX
|
||||
+dnl ===================================================================
|
||||
+AS_IF([test "x$AVX_CFLAGS" = "x"], [
|
||||
+ AS_IF([test "x$SUNCC" = "xyes" && test "x$AMD64_ABI" = "xno"], [
|
||||
+ AVX_CFLAGS="-xarch=avx"
|
||||
+ ])
|
||||
+], [
|
||||
+ AVX_CFLAGS="-mavx -Winline"
|
||||
+])
|
||||
+
|
||||
+have_avx_intrinsics=no
|
||||
+AC_MSG_CHECKING(whether to use AVX intrinsics)
|
||||
+avx_save_CFLAGS=$CFLAGS
|
||||
+CFLAGS="$AVX_CFLAGS $CFLAGS"
|
||||
+AC_COMPILE_IFELSE([
|
||||
+#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5))
|
||||
+# if !defined(__amd64__) && !defined(__x86_64__)
|
||||
+# error "Need GCC >= 4.5 for AVX intrinsics on x86"
|
||||
+# endif
|
||||
+#endif
|
||||
+#include <immintrin.h>
|
||||
+int main () {
|
||||
+ __m256i a = _mm256_set1_epi32 (0), b = _mm256_set1_epi32 (0), c;
|
||||
+ c = _mm256_permute2f128_si256 (a, b, 0);
|
||||
+ return 0;
|
||||
+}], have_avx_intrinsics=yes)
|
||||
+CFLAGS=$avx_save_CFLAGS
|
||||
+AC_MSG_RESULT([$have_avx_intrinsics])
|
||||
+AS_IF([test "x$have_avx_intrinsics" = "xyes"], [
|
||||
+ HAVE_GCC_AVX=TRUE
|
||||
+], [
|
||||
+ HAVE_GCC_AVX=FALSE
|
||||
+])
|
||||
+AC_SUBST(HAVE_GCC_AVX)
|
||||
+
|
||||
dnl ===================================================================
|
||||
dnl Set the ENABLE_PCH variable. (Activate --enable-pch)
|
||||
dnl ===================================================================
|
||||
diff --git a/set_soenv.in b/set_soenv.in
|
||||
index 4c047b6..a2b1b43 100755
|
||||
--- a/set_soenv.in
|
||||
+++ b/set_soenv.in
|
||||
@@ -1841,6 +1841,7 @@ ToFile( "JAVAHOME", $JAVAHOME, "e" );
|
||||
ToFile( "CC", $CC, "e" );
|
||||
ToFile( "HAVE_GCC_VISIBILITY_FEATURE",
|
||||
"@HAVE_GCC_VISIBILITY_FEATURE@", "e" );
|
||||
+ToFile( "HAVE_GCC_AVX", "@HAVE_GCC_AVX@", "e" );
|
||||
ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
|
||||
"@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
|
||||
ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
|
||||
@ -1,11 +0,0 @@
|
||||
--- solenv/gbuild/gbuild.mk 2011-03-21 19:46:14.427883458 +0100
|
||||
+++ solenv/gbuild/gbuild.mk 2011-03-21 19:46:37.019883448 +0100
|
||||
@@ -128,7 +128,7 @@
|
||||
endif
|
||||
endif
|
||||
ifneq ($(strip $(CXXFLAGS)),)
|
||||
-gb__ENV_CXXFLAGS := $(CFLAGS)
|
||||
+gb__ENV_CXXFLAGS := $(CXXFLAGS)
|
||||
else
|
||||
# TODO remove after the old build system is abolished
|
||||
ifneq ($(strip $(ENVCFLAGSCXX)),)
|
||||
@ -1,44 +0,0 @@
|
||||
From dcdcc53e25fce09be486d4ea700f8a72895a1e69 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Bergmann <sbergman@redhat.com>
|
||||
Date: Tue, 06 Sep 2011 07:39:07 +0000
|
||||
Subject: Honor --disable-strip in gbuild.
|
||||
|
||||
---
|
||||
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
|
||||
index 48bebeb..329eefa 100644
|
||||
--- a/solenv/gbuild/gbuild.mk
|
||||
+++ b/solenv/gbuild/gbuild.mk
|
||||
@@ -87,6 +87,12 @@ else
|
||||
gb_SYMBOL := $(false)
|
||||
endif
|
||||
|
||||
+ifeq ($(strip $(DISABLE_STRIP)$(disable_strip)),)
|
||||
+gb_STRIP := $(true)
|
||||
+else
|
||||
+gb_STRIP := $(false)
|
||||
+endif
|
||||
+
|
||||
gb_DEBUGLEVEL := 0
|
||||
ifneq ($(strip $(DEBUG)$(debug)),)
|
||||
gb_DEBUGLEVEL := 1
|
||||
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
|
||||
index 4234c71..5c71bd4 100644
|
||||
--- a/solenv/gbuild/platform/unxgcc.mk
|
||||
+++ b/solenv/gbuild/platform/unxgcc.mk
|
||||
@@ -163,9 +163,11 @@ gb_LinkTarget_LDFLAGS += \
|
||||
endif
|
||||
|
||||
ifneq ($(gb_SYMBOL),$(true))
|
||||
-gb_LinkTarget_LDFLAGS += \
|
||||
- -Wl,--strip-all \
|
||||
-
|
||||
+ifeq ($(gb_STRIP),$(true))
|
||||
+gb_LinkTarget_LDFLAGS += -Wl,--strip-all
|
||||
+else
|
||||
+gb_LinkTarget_LDFLAGS += -Wl,--strip-debug
|
||||
+endif
|
||||
endif
|
||||
|
||||
ifneq ($(gb_DEBUGLEVEL),0)
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,15 +0,0 @@
|
||||
--- scp2/inc/macros.inc.old 2011-05-18 17:51:47.000000000 +0200
|
||||
+++ scp2/inc/macros.inc 2011-07-18 19:58:27.000000000 +0200
|
||||
@@ -92,10 +92,10 @@
|
||||
#endif
|
||||
|
||||
#define BIN_FILE_BODY \
|
||||
- UnixRights = 555
|
||||
+ UnixRights = 755
|
||||
|
||||
#define TXT_FILE_BODY \
|
||||
- UnixRights = 444
|
||||
+ UnixRights = 644
|
||||
|
||||
#define USER_FILE_BODY \
|
||||
UnixRights = 644
|
||||
@ -1,52 +0,0 @@
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 1dc00d4..262fe00 100755
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -4962,6 +4962,7 @@ AC_SUBST(DB_CPPLIB)
|
||||
dnl ===================================================================
|
||||
dnl Check for system lucene
|
||||
dnl ===================================================================
|
||||
+if test "$with_java" != "no"; then
|
||||
AC_MSG_CHECKING([which lucene to use])
|
||||
if test -n "$with_system_lucene" -o -n "$with_system_libs" && \
|
||||
test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then
|
||||
@@ -5021,6 +5022,7 @@ else
|
||||
SYSTEM_LUCENE=NO
|
||||
BUILD_TYPE="$BUILD_TYPE LUCENE"
|
||||
fi
|
||||
+fi
|
||||
AC_SUBST(SYSTEM_LUCENE)
|
||||
AC_SUBST(LUCENE_CORE_JAR)
|
||||
AC_SUBST(LUCENE_ANALYZERS_JAR)
|
||||
@@ -5189,6 +5191,7 @@ AC_SUBST(HSQLDB_JAR)
|
||||
dnl ===================================================================
|
||||
dnl Check for system beanshell
|
||||
dnl ===================================================================
|
||||
+if test "$with_java" != "no"; then
|
||||
AC_MSG_CHECKING([which beanshell to use])
|
||||
if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \
|
||||
test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then
|
||||
@@ -5204,6 +5207,7 @@ else
|
||||
SYSTEM_BSH=NO
|
||||
BUILD_TYPE="$BUILD_TYPE BSH"
|
||||
fi
|
||||
+fi
|
||||
AC_SUBST(SYSTEM_BSH)
|
||||
AC_SUBST(BSH_JAR)
|
||||
|
||||
@@ -5211,6 +5215,7 @@ AC_SUBST(BSH_JAR)
|
||||
dnl ===================================================================
|
||||
dnl Check for system saxon
|
||||
dnl ===================================================================
|
||||
+if test "$with_java" != "no"; then
|
||||
AC_MSG_CHECKING([which saxon to use])
|
||||
if test -n "$with_system_saxon" -o -n "$with_system_libs" && \
|
||||
test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then
|
||||
@@ -5310,6 +5315,7 @@ else
|
||||
SYSTEM_SAXON=NO
|
||||
NEED_SAXON=TRUE
|
||||
fi
|
||||
+fi
|
||||
AC_SUBST(SYSTEM_SAXON)
|
||||
AC_SUBST(SAXON_JAR)
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From 0d7e2108425da1f81c20a605145679168486df59 Mon Sep 17 00:00:00 2001
|
||||
From: Luboš Luňák <l.lunak@suse.cz>
|
||||
Date: Fri, 06 Jan 2012 09:55:03 +0000
|
||||
Subject: workaround for LO namespace pollution breaking KDE4 fpicker build
|
||||
|
||||
---
|
||||
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||||
index f282645..69be3b1 100644
|
||||
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||||
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
|
||||
@@ -56,7 +56,10 @@
|
||||
#define Region QtXRegion
|
||||
|
||||
//kde has an enum that uses this...OO does too
|
||||
+#define LO_SETTINGS_MOUSE SETTINGS_MOUSE
|
||||
#undef SETTINGS_MOUSE
|
||||
+#define LO_SETTINGS_LOCALE SETTINGS_LOCALE
|
||||
+#undef SETTINGS_LOCALE
|
||||
|
||||
#include <kfiledialog.h>
|
||||
#include <kwindowsystem.h>
|
||||
@@ -70,6 +73,11 @@
|
||||
|
||||
#undef Region
|
||||
|
||||
+#define SETTINGS_MOUSE LO_SETTINGS_MOUSE
|
||||
+#undef LO_SETTINGS_MOUSE
|
||||
+#define SETTINGS_LOCALE LO_SETTINGS_LOCALE
|
||||
+#undef LO_SETTINGS_LOCALE
|
||||
+
|
||||
using namespace ::com::sun::star;
|
||||
|
||||
using namespace ::com::sun::star::ui::dialogs;
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,12 +0,0 @@
|
||||
diff -urN libreoffice-ure-3.4.2.3.old/sal/cppunittester/cppunittester.cxx libreoffice-ure-3.4.2.3/sal/cppunittester/cppunittester.cxx
|
||||
--- libreoffice-ure-3.4.2.3.old/sal/cppunittester/cppunittester.cxx 2011-08-11 20:03:27.877207705 +0200
|
||||
+++ libreoffice-ure-3.4.2.3/sal/cppunittester/cppunittester.cxx 2011-08-11 20:03:55.351864224 +0200
|
||||
@@ -94,6 +94,8 @@
|
||||
SetErrorMode(SEM_NOGPFAULTERRORBOX|dwMode);
|
||||
#endif
|
||||
|
||||
+ return 0;
|
||||
+
|
||||
CppUnit::TestResult result;
|
||||
sal_uInt32 index = 0;
|
||||
for (; index < rtl_getAppCommandArgCount(); index += 3) {
|
||||
@ -1,25 +0,0 @@
|
||||
--- configure.in.orig 2011-01-13 21:12:40.420005851 +0100
|
||||
+++ configure.in 2011-01-13 21:15:23.680008513 +0100
|
||||
@@ -4456,16 +4456,17 @@
|
||||
else return 1;
|
||||
}
|
||||
], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])])
|
||||
- DB_LIB=
|
||||
- for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do
|
||||
- AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] ,
|
||||
- AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ]
|
||||
+ save_LIBS="$LIBS"
|
||||
+ for dbver in -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4 ''; do
|
||||
+ AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ] ,
|
||||
+ AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break; ]
|
||||
)
|
||||
)
|
||||
done
|
||||
if test -z "$DB_LIB" ; then
|
||||
- AC_MSG_ERROR([db not installed or functional])
|
||||
+ AC_CHECK_FUNC(dbopen, [], [ AC_MSG_ERROR([db not installed or functional]) ])
|
||||
fi
|
||||
+ LIBS="$save_LIBS"
|
||||
SCPDEFS="$SCPDEFS -DSYSTEM_DB"
|
||||
else
|
||||
AC_MSG_RESULT([internal])
|
||||
@ -1,33 +0,0 @@
|
||||
From 9540db43f3f1b11d3407a45aefda235d7e78f76b Mon Sep 17 00:00:00 2001
|
||||
From: Caolán McNamara <caolanm@redhat.com>
|
||||
Date: Fri, 02 Sep 2011 12:15:49 +0000
|
||||
Subject: Resolves: rhbz#735182 libreoffice doesn't build with poppler-0.17.3
|
||||
|
||||
---
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
index 5022dd5..bd6d721 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -150,7 +150,11 @@ void writeBinaryBuffer( const OutputBuffer& rBuffer )
|
||||
void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str, bool bWithLinefeed )
|
||||
{
|
||||
// dump JPEG file as-is
|
||||
+#if POPPLER_CHECK_VERSION(0, 17, 3)
|
||||
+ str = str->getBaseStream();
|
||||
+#else
|
||||
str = ((DCTStream *)str)->getRawStream();
|
||||
+#endif
|
||||
str->reset();
|
||||
|
||||
int c;
|
||||
@@ -490,7 +494,7 @@ void PDFOutDev::endPage()
|
||||
}
|
||||
|
||||
#if POPPLER_CHECK_VERSION(0, 17, 0)
|
||||
-void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
|
||||
+void PDFOutDev::processLink(AnnotLink *link, Catalog *)
|
||||
#else
|
||||
void PDFOutDev::processLink(Link* link, Catalog*)
|
||||
#endif
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,62 +0,0 @@
|
||||
From 53e66aea4c1b3617363fd138a7903190d964da6b Mon Sep 17 00:00:00 2001
|
||||
From: Tomáš Chvátal <tchvatal@suse.cz>
|
||||
Date: Fri, 30 Sep 2011 09:51:04 +0000
|
||||
Subject: This is merge of f6f8f67460bba296c49f794d14621b7313df4f7d.
|
||||
|
||||
It is not posible to git-am due to merge to core/ repository.
|
||||
It had one minor collision on pdfioutdev_gpl.hxx.
|
||||
|
||||
Orginal header:
|
||||
From f6f8f67460bba296c49f794d14621b7313df4f7d Mon Sep 17 00:00:00 2001
|
||||
From: Caolán McNamara <caolanm@redhat.com>
|
||||
Date: Tue, 19 Jul 2011 07:54:07 +0000
|
||||
Subject: poppler 0.17.0 changed its api for no some reason or other
|
||||
---
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
index f7741b4..5022dd5 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
||||
@@ -489,7 +489,11 @@ void PDFOutDev::endPage()
|
||||
printf("endPage\n");
|
||||
}
|
||||
|
||||
+#if POPPLER_CHECK_VERSION(0, 17, 0)
|
||||
+void PDFOutDev::processLink(AnnotLink *link, Catalog *catalog)
|
||||
+#else
|
||||
void PDFOutDev::processLink(Link* link, Catalog*)
|
||||
+#endif
|
||||
{
|
||||
assert(link);
|
||||
|
||||
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
index 3ac0f49..8a1708c 100644
|
||||
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
|
||||
@@ -65,7 +65,10 @@ class GfxPath;
|
||||
class GfxFont;
|
||||
class PDFDoc;
|
||||
#ifndef SYSTEM_POPPLER
|
||||
+#define POPPLER_CHECK_VERSION(major,minor,micro) (0)
|
||||
typedef GString GooString;
|
||||
+#else
|
||||
+#include <glib/poppler-features.h>
|
||||
#endif
|
||||
|
||||
namespace pdfi
|
||||
@@ -193,9 +196,13 @@ namespace pdfi
|
||||
// Convert between device and user coordinates.
|
||||
// virtual void cvtDevToUser(double dx, double dy, double *ux, double *uy);
|
||||
// virtual void cvtUserToDev(double ux, double uy, int *dx, int *dy);
|
||||
-
|
||||
+
|
||||
+ #if POPPLER_CHECK_VERSION(0, 17, 0)
|
||||
+ virtual void processLink(AnnotLink *link, Catalog *catalog);
|
||||
+ #else
|
||||
//----- link borders
|
||||
virtual void processLink(Link *link, Catalog *catalog);
|
||||
+ #endif
|
||||
|
||||
//----- save/restore graphics state
|
||||
virtual void saveState(GfxState *state);
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
@ -1,17 +0,0 @@
|
||||
From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001
|
||||
From: Caolán McNamara <caolanm@redhat.com>
|
||||
Date: Tue, 12 Apr 2011 19:35:51 +0000
|
||||
Subject: duplicate NULLs
|
||||
|
||||
---
|
||||
diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
|
||||
index 91f44b7..714d926 100644
|
||||
--- a/ct2n/prj/build.lst
|
||||
+++ b/ct2n/prj/build.lst
|
||||
@@ -1,3 +1,3 @@
|
||||
-ct2n ct2n : solenv NULL NULL
|
||||
+ct2n ct2n : solenv NULL
|
||||
ct2n ct2n usr1 - all ct2n_mkout NULL
|
||||
ct2n ct2n nmake - all ct2n_ct2n NULL
|
||||
--
|
||||
cgit v0.8.3-6-g21f6
|
||||
@ -1,28 +0,0 @@
|
||||
--- libreoffice-bootstrap-3.4.2.2/svx/AllLangResTarget_svx.mk.old 2011-07-24 21:49:06.000000000 +0200
|
||||
+++ libreoffice-bootstrap-3.4.2.2/svx/AllLangResTarget_svx.mk 2011-07-24 22:02:11.000000000 +0200
|
||||
@@ -106,11 +106,11 @@
|
||||
# hack !!!
|
||||
# just a temporary - globlmn.hrc about to be removed!
|
||||
ifeq ($(strip $(WITH_LANG)),)
|
||||
-$(WORKDIR)/inc/svx/globlmn.hrc : $(realpath $(SRCDIR)/svx/inc/globlmn_tmpl.hrc)
|
||||
+$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc
|
||||
echo copying $@
|
||||
-mkdir -p $(WORKDIR)/inc/svx
|
||||
- cp $< $@
|
||||
- $(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc)
|
||||
+ cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc
|
||||
+ cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(OUTDIR)/inc/svx/globlmn.hrc
|
||||
rm -f $(WORKDIR)/inc/svx/lastrun.mk
|
||||
else
|
||||
-include $(WORKDIR)/inc/svx/lastrun.mk
|
||||
@@ -125,8 +125,8 @@
|
||||
$(call gb_Helper_abbreviate_dirs_native, \
|
||||
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
|
||||
-p svx \
|
||||
- -i $< -o $@ -m $(realpath $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf) -l all)
|
||||
- $(call gb_Deliver_deliver, $@, $(OUTDIR)/inc/svx/globlmn.hrc)
|
||||
+ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all)
|
||||
+ cp $(WORKDIR)/inc/svx/globlmn.hrc $(OUTDIR)/inc/svx/globlmn.hrc
|
||||
endif
|
||||
|
||||
.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean
|
||||
@ -1,7 +0,0 @@
|
||||
--- translate_toolkit/prj/build.lst 2011-07-26 17:21:41.006169229 +0200
|
||||
+++ translate_toolkit/prj/build.lst 2011-07-26 17:21:52.854170398 +0200
|
||||
@@ -1,3 +1,3 @@
|
||||
-trt translate_toolkit : PYTHON:python NULL
|
||||
+trt translate_toolkit : solenv PYTHON:python NULL
|
||||
trt translate_toolkit usr1 - all trt_mkout NULL
|
||||
trt translate_toolkit nmake - all translate_toolkit NULL
|
||||
@ -1,33 +0,0 @@
|
||||
--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000
|
||||
+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000
|
||||
@@ -238,7 +238,7 @@
|
||||
|
||||
// including a HelperInterface implementation
|
||||
template< typename Ifc1 >
|
||||
-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
|
||||
+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
|
||||
{
|
||||
typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
|
||||
protected:
|
||||
--- sc/Library_vbaobj.mk
|
||||
+++ sc/Library_vbaobj.mk
|
||||
@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
|
||||
sc/source/ui/vba/vbaquerytable \
|
||||
sc/source/ui/vba/vbarange \
|
||||
sc/source/ui/vba/vbasheetobject \
|
||||
- sc/source/ui/vba/vbasheetobjects \
|
||||
sc/source/ui/vba/vbastyle \
|
||||
sc/source/ui/vba/vbastyles \
|
||||
sc/source/ui/vba/vbatextboxshape \
|
||||
@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
|
||||
sc/source/ui/vba/vbawsfunction \
|
||||
))
|
||||
|
||||
+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
|
||||
+ sc/source/ui/vba/vbasheetobjects \
|
||||
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
|
||||
+))
|
||||
+
|
||||
ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
|
||||
$(eval $(call gb_Library_set_ldflags,vbaobj,\
|
||||
$$(LDFLAGS) \
|
||||
@ -1,565 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.23 2012/03/22 15:07:05 scarabeus Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
KDE_REQUIRED="optional"
|
||||
KDE_SCM="git"
|
||||
CMAKE_REQUIRED="never"
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
PYTHON_USE_WITH="threads,xml"
|
||||
|
||||
# experimental ; release ; old
|
||||
# Usually the tarballs are moved a lot so this should make
|
||||
# everyone happy.
|
||||
DEV_URI="
|
||||
http://dev-builds.libreoffice.org/pre-releases/src
|
||||
http://download.documentfoundation.org/libreoffice/src
|
||||
http://download.documentfoundation.org/libreoffice/old/src
|
||||
"
|
||||
EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
|
||||
ADDONS_URI="http://dev-www.libreoffice.org/src/"
|
||||
|
||||
BRANDING="${PN}-branding-gentoo-0.4.tar.xz"
|
||||
|
||||
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
|
||||
inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
|
||||
unset SCM_ECLASS
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI="branding? ( http://dev.gentooexperimental.org/~scarabeus/${BRANDING} )"
|
||||
|
||||
# Bootstrap MUST be first!
|
||||
MODULES="bootstrap artwork base calc components extensions extras filters help
|
||||
impress libs-core libs-extern libs-extern-sys libs-gui postprocess sdk testing
|
||||
ure writer"
|
||||
# Only release has the tarballs
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
for i in ${DEV_URI}; do
|
||||
for mod in ${MODULES}; do
|
||||
SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.bz2"
|
||||
done
|
||||
unset mod
|
||||
done
|
||||
unset i
|
||||
fi
|
||||
unset DEV_URI
|
||||
|
||||
# addons
|
||||
# FIXME: actually review which one of these are used
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz"
|
||||
ADDONS_SRC+=" ${ADDONS_URI}/71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz"
|
||||
ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll"
|
||||
ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2"
|
||||
ADDONS_SRC+=" http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip"
|
||||
SRC_URI+=" ${ADDONS_SRC}"
|
||||
|
||||
TDEPEND="${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt"
|
||||
TDEPEND+=" linguas_de? ( ${EXT_URI}/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt )"
|
||||
TDEPEND+=" linguas_en_GB? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
|
||||
TDEPEND+=" linguas_en_ZA? ( ${EXT_URI}/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt )"
|
||||
TDEPEND+=" linguas_es? ( ${EXT_URI}/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt )"
|
||||
TDEPEND+=" linguas_fr? ( ${EXT_URI}/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt )"
|
||||
TDEPEND+=" linguas_hu? ( ${EXT_URI}/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt )"
|
||||
TDEPEND+=" linguas_it? ( ${EXT_URI}/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt )"
|
||||
SRC_URI+=" templates? ( ${TDEPEND} )"
|
||||
|
||||
unset ADDONS_URI
|
||||
unset EXT_URI
|
||||
unset ADDONS_SRC
|
||||
|
||||
IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite
|
||||
gstreamer gtk kde ldap mysql nsplugin odk opengl python templates test +vba
|
||||
webdav pdfimport"
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
|
||||
|
||||
# lingua for templates
|
||||
LANGUAGES="de en_GB en_ZA es fr hu it"
|
||||
for X in ${LANGUAGES} ; do
|
||||
IUSE+=" linguas_${X}"
|
||||
done
|
||||
unset X
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-arch/zip
|
||||
app-arch/unzip
|
||||
>=app-text/hunspell-1.3.2-r1
|
||||
app-text/mythes
|
||||
app-text/libwpd:0.9[tools]
|
||||
app-text/libwpg:0.2
|
||||
>=app-text/libwps-0.2.2
|
||||
dev-db/unixODBC
|
||||
dev-libs/expat
|
||||
>=dev-libs/glib-2.28
|
||||
>=dev-libs/hyphen-2.7.1
|
||||
>=dev-libs/icu-4.8.1-r1
|
||||
>=dev-lang/perl-5.0
|
||||
>=dev-libs/openssl-0.9.8g
|
||||
>=dev-libs/redland-1.0.14[ssl]
|
||||
media-libs/freetype:2
|
||||
>=media-libs/fontconfig-2.8.0
|
||||
>=media-libs/vigra-1.7
|
||||
>=media-libs/libpng-1.4
|
||||
net-print/cups
|
||||
sci-mathematics/lpsolve
|
||||
>=sys-libs/db-4.8
|
||||
virtual/jpeg
|
||||
>=x11-libs/cairo-1.10.0[X]
|
||||
x11-libs/libXaw
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] )
|
||||
dbus? ( >=dev-libs/dbus-glib-0.92 )
|
||||
eds? ( gnome-extra/evolution-data-server )
|
||||
gnome? (
|
||||
gnome-base/gconf:2
|
||||
gnome-base/orbit:2
|
||||
)
|
||||
gtk? ( >=x11-libs/gtk+-2.24:2 )
|
||||
graphite? ( media-gfx/graphite2 )
|
||||
gstreamer? (
|
||||
>=media-libs/gstreamer-0.10
|
||||
>=media-libs/gst-plugins-base-0.10
|
||||
)
|
||||
java? (
|
||||
>=dev-java/bsh-2.0_beta4
|
||||
dev-java/lucene:2.9
|
||||
dev-java/lucene-analyzers:2.3
|
||||
dev-java/saxon:0
|
||||
)
|
||||
ldap? ( net-nds/openldap )
|
||||
mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
|
||||
nsplugin? (
|
||||
net-libs/xulrunner:1.9
|
||||
>=dev-libs/nspr-4.8.8
|
||||
>=dev-libs/nss-3.12.9
|
||||
)
|
||||
opengl? ( virtual/opengl )
|
||||
webdav? ( net-libs/neon )
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-office/libreoffice-bin
|
||||
!app-office/libreoffice-bin-debug
|
||||
!app-office/openoffice-bin
|
||||
!app-office/openoffice
|
||||
java? ( >=virtual/jre-1.6 )
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
=app-office/libreoffice-l10n-$(get_version_component_range 1-3)*
|
||||
"
|
||||
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/boost-1.46
|
||||
>=dev-libs/libxml2-2.7.8
|
||||
dev-libs/libxslt
|
||||
dev-perl/Archive-Zip
|
||||
>=dev-util/gperf-3
|
||||
dev-util/intltool
|
||||
dev-util/mdds
|
||||
>=dev-util/pkgconfig-0.26
|
||||
>=net-misc/curl-7.21.4
|
||||
>=sys-apps/findutils-4.4.2
|
||||
sys-devel/bison
|
||||
sys-apps/coreutils
|
||||
sys-devel/flex
|
||||
>=sys-devel/make-3.82
|
||||
sys-libs/zlib
|
||||
x11-libs/libXtst
|
||||
x11-proto/randrproto
|
||||
x11-proto/xextproto
|
||||
x11-proto/xineramaproto
|
||||
x11-proto/xproto
|
||||
java? (
|
||||
=virtual/jdk-1.6*
|
||||
>=dev-java/ant-core-1.7
|
||||
test? ( dev-java/junit:4 )
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-3.3.1-neon_remove_SSPI_support.diff"
|
||||
"${FILESDIR}/${PN}-libdb5-fix-check.diff"
|
||||
"${FILESDIR}/${PN}-3.4.1-salfix.diff"
|
||||
"${FILESDIR}/sdext-presenter.diff"
|
||||
"${FILESDIR}/${PN}-svx.patch"
|
||||
"${FILESDIR}/${PN}-vbaobj-visibility-fix.patch"
|
||||
"${FILESDIR}/${PN}-solenv-build-crash.patch"
|
||||
"${FILESDIR}/${PN}-as-needed-gtk.patch"
|
||||
"${FILESDIR}/${PN}-translate-toolkit-parallel-solenv.patch"
|
||||
"${FILESDIR}/${PN}-gbuild-use-cxxflags.patch"
|
||||
"${FILESDIR}/${PN}-installed-files-permissions.patch"
|
||||
"${FILESDIR}/${PN}-check-for-avx.patch"
|
||||
"${FILESDIR}/${PN}-append-no-avx.patch"
|
||||
"${FILESDIR}/${PN}-32b-qt4-libdir.patch"
|
||||
"${FILESDIR}/${PN}-binfilter-as-needed.patch"
|
||||
"${FILESDIR}/${PN}-kill-cppunit.patch"
|
||||
"${FILESDIR}/${PN}-honor-strip.patch"
|
||||
"${FILESDIR}/${PN}-java.patch"
|
||||
"${FILESDIR}/${PN}-poppler-0.18.0.patch"
|
||||
"${FILESDIR}/${PN}-poppler-0.18.0-2.patch"
|
||||
)
|
||||
|
||||
# Uncoment me when updating to eapi4
|
||||
# REQUIRED_USE="
|
||||
# || ( gtk gnome kde )
|
||||
# gnome? ( gtk )
|
||||
# nsplugin? ( gtk )
|
||||
#"
|
||||
|
||||
# Needs lots and lots of work and compiling
|
||||
RESTRICT="test"
|
||||
|
||||
S="${WORKDIR}/${PN}-bootstrap-${PV}"
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-opt-2_pkg_setup
|
||||
kde4-base_pkg_setup
|
||||
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
|
||||
if [[ $(gcc-major-version) -lt 4 ]]; then
|
||||
eerror "Compilation with gcc older than 4.0 is not supported"
|
||||
die "Too old gcc found."
|
||||
fi
|
||||
|
||||
if use custom-cflags; then
|
||||
ewarn "You are using custom CFLAGS, which is NOT supported and can cause"
|
||||
ewarn "all sorts of build and runtime errors."
|
||||
ewarn
|
||||
ewarn "Before reporting a bug, please make sure you rebuild and try with"
|
||||
ewarn "basic CFLAGS, otherwise the bug will not be accepted."
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! use java; then
|
||||
ewarn "You are building with java-support disabled, this results in some"
|
||||
ewarn "of the LibreOffice functionality being disabled."
|
||||
ewarn "If something you need does not work for you, rebuild with"
|
||||
ewarn "java in your USE-flags."
|
||||
ewarn
|
||||
ewarn "Some java libraries will be provided internally by libreoffice"
|
||||
ewarn "during the build. You should really reconsider enabling java"
|
||||
ewarn "use flag."
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! use gtk; then
|
||||
ewarn "If you want the LibreOffice systray quickstarter to work"
|
||||
ewarn "activate the 'gtk' use flag."
|
||||
ewarn
|
||||
fi
|
||||
|
||||
# Check if we have enough RAM and free diskspace to build this beast
|
||||
CHECKREQS_MEMORY="1G"
|
||||
use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
|
||||
check-reqs_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
local mod dest tmplfile tmplname mypv
|
||||
|
||||
if use branding; then
|
||||
unpack "${BRANDING}"
|
||||
fi
|
||||
|
||||
if [[ ${PV} != *9999* ]]; then
|
||||
for mod in ${MODULES}; do
|
||||
unpack "${PN}-${mod}-${PV}.tar.bz2"
|
||||
if [[ ${mod} != bootstrap ]]; then
|
||||
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
|
||||
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
fi
|
||||
done
|
||||
else
|
||||
for mod in ${MODULES}; do
|
||||
mypv=${PV/.9999}
|
||||
[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
|
||||
EGIT_PROJECT="${PN}/${mod}"
|
||||
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
|
||||
EGIT_NOUNPACK="true"
|
||||
git-2_src_unpack
|
||||
if [[ ${mod} != bootstrap ]]; then
|
||||
mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}"
|
||||
rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
|
||||
fi
|
||||
done
|
||||
unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
|
||||
fi
|
||||
|
||||
# copy extension templates; o what fun ...
|
||||
if use templates; then
|
||||
dest="${S}/extras/source/extensions"
|
||||
mkdir -p "${dest}"
|
||||
|
||||
for template in ${TDEPEND}; do
|
||||
if [[ ${template} == *.oxt ]]; then
|
||||
tmplfile="${DISTDIR}/$(basename ${template})"
|
||||
tmplname="$(echo "${template}" | \
|
||||
cut -f 2- -s -d - | cut -f 1 -d _)"
|
||||
echo ">>> Unpacking ${tmplfile/\*/} to ${dest}"
|
||||
if [[ -f ${tmplfile} && ! -f "${dest}/${tmplname}.oxt" ]]; then
|
||||
cp -v "${tmplfile}" "${dest}/${tmplname}.oxt" || die
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# optimization flags
|
||||
export ARCH_FLAGS="${CXXFLAGS}"
|
||||
use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
|
||||
|
||||
# compiler flags
|
||||
use custom-cflags || strip-flags
|
||||
use debug || filter-flags "-g*"
|
||||
# silent miscompiles; LO/OOo adds -O2/1/0 where appropriate
|
||||
filter-flags "-O*"
|
||||
|
||||
base_src_prepare
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local java_opts
|
||||
local internal_libs
|
||||
local extensions
|
||||
local themes="crystal"
|
||||
local jbs=$(sed -ne 's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
|
||||
|
||||
# recheck that there is some value in jobs
|
||||
[[ -z ${jbs} ]] && jbs="1"
|
||||
|
||||
# expand themes we are going to build based on DE useflags
|
||||
use gnome && themes+=" tango"
|
||||
use kde && themes+=" oxygen"
|
||||
|
||||
# list the extensions we are going to build by default
|
||||
extensions="
|
||||
$(use_enable pdfimport ext-pdfimport)
|
||||
--enable-ext-presenter-console
|
||||
--enable-ext-presenter-minimizer
|
||||
"
|
||||
|
||||
# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
|
||||
# dmake: not worth of splitting out
|
||||
# cppunit: patched not to run anything, just main() { return 0; }
|
||||
# workaround to upstream running the tests during build
|
||||
# sane: just sane.h header that is used for scan in writer, not
|
||||
# linked or anything else, worthless to depend on
|
||||
internal_libs+="
|
||||
--without-system-hsqldb
|
||||
--without-system-cppunit
|
||||
--without-system-sane-header
|
||||
"
|
||||
|
||||
# When building without java some things needs to be done
|
||||
# as internal libraries.
|
||||
if ! use java; then
|
||||
internal_libs+="
|
||||
--without-junit
|
||||
"
|
||||
else
|
||||
java_opts="
|
||||
--with-ant-home="${ANT_HOME}"
|
||||
--with-jdk-home=$(java-config --jdk-home 2>/dev/null)
|
||||
--with-java-target-version=$(java-pkg_get-target)
|
||||
--with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
|
||||
--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)
|
||||
--with-lucene-core-jar=$(java-pkg_getjar lucene-2.9 lucene-core.jar)
|
||||
--with-lucene-analyzers-jar=$(java-pkg_getjar lucene-analyzers-2.3 lucene-analyzers.jar)
|
||||
--with-saxon-jar=$(java-pkg_getjar saxon saxon8.jar)
|
||||
"
|
||||
if use test; then
|
||||
java_opts+=" --with-junit=$(java-pkg_getjar junit-4 junit.jar)"
|
||||
else
|
||||
java_opts+=" --without-junit"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use branding; then
|
||||
extensions+="
|
||||
--with-about-bitmap="${WORKDIR}/branding-about.png"
|
||||
--with-intro-bitmap="${WORKDIR}/branding-intro.png"
|
||||
"
|
||||
fi
|
||||
|
||||
# system headers/libs/...: enforce using system packages
|
||||
# only expections are mozilla and odbc/sane/xrender-header(s).
|
||||
# for jars the exception is db.jar controlled by --with-system-db
|
||||
# --enable-unix-qstart-libpng: use libpng splashscreen that is faster
|
||||
# --disable-broffice: do not use brazillian brand just be uniform
|
||||
# --enable-cairo: ensure that cairo is always required
|
||||
# --enable-*-link: link to the library rather than just dlopen on runtime
|
||||
# --disable-fetch-external: prevent dowloading during compile phase
|
||||
# --disable-gnome-vfs: old gnome virtual fs support
|
||||
# --disable-kdeab: kde3 adressbook
|
||||
# --disable-kde: kde3 support
|
||||
# --disable-pch: precompiled headers cause build crashes
|
||||
# --disable-rpath: relative runtime path is not desired
|
||||
# --disable-static-gtk: ensure that gtk is linked dynamically
|
||||
# --disable-zenity: disable build icon
|
||||
# --with-extension-integration: enable any extension integration support
|
||||
# --with-{max-jobs,num-cpus}: ensuring parallel building
|
||||
# --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
|
||||
# --without-stlport: disable deprecated extensions framework
|
||||
econf \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}/" \
|
||||
--with-system-headers \
|
||||
--with-system-libs \
|
||||
--with-system-jars \
|
||||
--with-system-db \
|
||||
--with-system-dicts \
|
||||
--enable-cairo \
|
||||
--enable-cups \
|
||||
--enable-fontconfig \
|
||||
--enable-largefile \
|
||||
--enable-randr \
|
||||
--enable-randr-link \
|
||||
--enable-unix-qstart-libpng \
|
||||
--enable-Xaw \
|
||||
--enable-xrender-link \
|
||||
--disable-broffice \
|
||||
--disable-crashdump \
|
||||
--disable-dependency-tracking \
|
||||
--disable-epm \
|
||||
--disable-fetch-external \
|
||||
--disable-gnome-vfs \
|
||||
--disable-kdeab \
|
||||
--disable-kde \
|
||||
--disable-online-update \
|
||||
--disable-pch \
|
||||
--disable-rpath \
|
||||
--disable-static-gtk \
|
||||
--disable-strip-solver \
|
||||
--disable-zenity \
|
||||
--with-alloc=system \
|
||||
--with-build-version="Gentoo official package" \
|
||||
--with-extension-integration \
|
||||
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
|
||||
--with-external-tar="${DISTDIR}" \
|
||||
--with-lang="" \
|
||||
--with-max-jobs=${jbs} \
|
||||
--with-num-cpus=1 \
|
||||
--with-theme="${themes}" \
|
||||
--with-unix-wrapper=libreoffice \
|
||||
--with-vendor="Gentoo Foundation" \
|
||||
--with-x \
|
||||
--without-afms \
|
||||
--without-fonts \
|
||||
--without-myspell-dicts \
|
||||
--without-ppds \
|
||||
--without-stlport \
|
||||
--without-helppack-integration \
|
||||
$(use_enable binfilter) \
|
||||
$(use_enable dbus) \
|
||||
$(use_enable debug crashdump) \
|
||||
$(use_enable eds evolution2) \
|
||||
$(use_enable gnome gconf) \
|
||||
$(use_enable gnome gio) \
|
||||
$(use_enable gnome lockdown) \
|
||||
$(use_enable graphite) \
|
||||
$(use_enable gstreamer) \
|
||||
$(use_enable gtk) \
|
||||
$(use_enable gtk systray) \
|
||||
$(use_enable java ext-scripting-beanshell) \
|
||||
$(use_enable kde kde4) \
|
||||
$(use_enable ldap) \
|
||||
$(use_enable mysql ext-mysql-connector) \
|
||||
$(use_enable nsplugin mozilla) \
|
||||
$(use_enable odk) \
|
||||
$(use_enable opengl) \
|
||||
$(use_enable python) \
|
||||
$(use_enable python ext-scripting-python) \
|
||||
$(use_enable vba) \
|
||||
$(use_enable vba activex-component) \
|
||||
$(use_enable webdav neon) \
|
||||
$(use_with java) \
|
||||
$(use_with ldap openldap) \
|
||||
$(use_with mysql system-mysql-cppconn) \
|
||||
$(use_with nsplugin system-mozilla libxul) \
|
||||
$(use_with templates sun-templates) \
|
||||
${internal_libs} \
|
||||
${java_opts} \
|
||||
${extensions}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# this is not a proper make script and the jobs are passed during configure
|
||||
make || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# This is not Makefile so no buildserver
|
||||
make DESTDIR="${D}" distro-pack-install || die
|
||||
|
||||
# Fix bash completion placement
|
||||
dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
|
||||
rm -rf "${ED}"/etc/
|
||||
|
||||
# symlink the plugin to system location
|
||||
if use nsplugin; then
|
||||
inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
|
||||
fi
|
||||
|
||||
if use branding; then
|
||||
insinto /usr/$(get_libdir)/${PN}/program
|
||||
newins "${WORKDIR}/branding-sofficerc" sofficerc || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Cache updates - all handled by kde eclass for all environments
|
||||
kde4-base_pkg_preinst
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kde4-base_pkg_postinst
|
||||
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kde4-base_pkg_postrm
|
||||
}
|
||||
@ -0,0 +1,384 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.1.ebuild,v 1.1 2012/04/26 11:33:41 olemarkus Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
|
||||
|
||||
SUHOSIN_VERSION=""
|
||||
FPM_VERSION="builtin"
|
||||
EXPECTED_TEST_FAILURES=""
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
|
||||
function php_get_uri ()
|
||||
{
|
||||
case "${1}" in
|
||||
"php-stas")
|
||||
echo "http://downloads.php.net/stas/${2}"
|
||||
;;
|
||||
"php-pre")
|
||||
echo "http://downloads.php.net/johannes/${2}"
|
||||
;;
|
||||
"php")
|
||||
echo "http://www.php.net/distributions/${2}"
|
||||
;;
|
||||
"suhosin")
|
||||
echo "http://download.suhosin.org/${2}"
|
||||
;;
|
||||
"olemarkus")
|
||||
echo "http://dev.gentoo.org/~olemarkus/php/${2}"
|
||||
;;
|
||||
"gentoo")
|
||||
echo "mirror://gentoo/${2}"
|
||||
;;
|
||||
*)
|
||||
die "unhandled case in php_get_uri"
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
PHP_MV="$(get_major_version)"
|
||||
SLOT="$(get_version_component_range 1-2)"
|
||||
|
||||
# alias, so we can handle different types of releases (finals, rcs, alphas,
|
||||
# betas, ...) w/o changing the whole ebuild
|
||||
PHP_PV="${PV/_rc/RC}"
|
||||
PHP_PV="${PHP_PV/_alpha/alpha}"
|
||||
PHP_PV="${PHP_PV/_beta/beta}"
|
||||
PHP_RELEASE="php"
|
||||
PHP_P="${PN}-${PHP_PV}"
|
||||
|
||||
PHP_PATCHSET_LOC="olemarkus"
|
||||
|
||||
PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")"
|
||||
|
||||
PHP_PATCHSET="2"
|
||||
PHP_PATCHSET_URI="
|
||||
$(php_get_uri "${PHP_PATCHSET_LOC}" "php-patchset-$SLOT-${PHP_PATCHSET}.tar.bz2")"
|
||||
|
||||
PHP_FPM_INIT_VER="4"
|
||||
PHP_FPM_CONF_VER="1"
|
||||
|
||||
if [[ ${SUHOSIN_VERSION} == *-gentoo ]]; then
|
||||
# in some cases we use our own suhosin patch (very recent version,
|
||||
# patch conflicts, etc.)
|
||||
SUHOSIN_TYPE="gentoo"
|
||||
else
|
||||
SUHOSIN_TYPE="suhosin"
|
||||
fi
|
||||
|
||||
if [[ -n ${SUHOSIN_VERSION} ]]; then
|
||||
SUHOSIN_PATCH="suhosin-patch-${SUHOSIN_VERSION}.patch";
|
||||
SUHOSIN_URI="$(php_get_uri ${SUHOSIN_TYPE} ${SUHOSIN_PATCH}.gz )"
|
||||
fi
|
||||
|
||||
SRC_URI="
|
||||
${PHP_SRC_URI}
|
||||
${PHP_PATCHSET_URI}"
|
||||
|
||||
if [[ -n ${SUHOSIN_VERSION} ]]; then
|
||||
SRC_URI="${SRC_URI}
|
||||
suhosin? ( ${SUHOSIN_URI} )"
|
||||
fi
|
||||
|
||||
DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs."
|
||||
HOMEPAGE="http://php.net/"
|
||||
LICENSE="PHP-3"
|
||||
|
||||
S="${WORKDIR}/${PHP_P}"
|
||||
|
||||
# We can build the following SAPIs in the given order
|
||||
SAPIS="embed cli cgi fpm apache2"
|
||||
|
||||
# Gentoo-specific, common features
|
||||
IUSE="kolab"
|
||||
|
||||
# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
|
||||
IUSE="${IUSE}
|
||||
${SAPIS/cli/+cli}
|
||||
threads"
|
||||
|
||||
IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk
|
||||
crypt +ctype curl curlwrappers debug doc
|
||||
enchant exif frontbase +fileinfo +filter firebird
|
||||
flatfile ftp gd gdbm gmp +hash +iconv imap inifile
|
||||
intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash
|
||||
mssql mysql mysqlnd mysqli nls
|
||||
oci8-instant-client odbc pcntl pdo +phar pic +posix postgres qdbm
|
||||
readline recode +session sharedmem
|
||||
+simplexml snmp soap sockets spell sqlite3 ssl
|
||||
sybase-ct sysvipc tidy +tokenizer truetype unicode wddx
|
||||
+xml xmlreader xmlwriter xmlrpc xpm xsl zip zlib"
|
||||
|
||||
# Enable suhosin if available
|
||||
[[ -n $SUHOSIN_VERSION ]] && IUSE="${IUSE} suhosin"
|
||||
|
||||
DEPEND="
|
||||
>=app-admin/eselect-php-0.6.2
|
||||
>=dev-libs/libpcre-8.12[unicode]
|
||||
apache2? ( www-servers/apache[threads=] )
|
||||
berkdb? ( =sys-libs/db-4* )
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
|
||||
cjk? ( !gd? (
|
||||
virtual/jpeg
|
||||
media-libs/libpng
|
||||
sys-libs/zlib
|
||||
) )
|
||||
crypt? ( >=dev-libs/libmcrypt-2.4 )
|
||||
curl? ( >=net-misc/curl-7.10.5 )
|
||||
enchant? ( app-text/enchant )
|
||||
exif? ( !gd? (
|
||||
virtual/jpeg
|
||||
media-libs/libpng
|
||||
sys-libs/zlib
|
||||
) )
|
||||
firebird? ( dev-db/firebird )
|
||||
gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib )
|
||||
gdbm? ( >=sys-libs/gdbm-1.8.0 )
|
||||
gmp? ( >=dev-libs/gmp-4.1.2 )
|
||||
iconv? ( virtual/libiconv )
|
||||
imap? ( virtual/imap-c-client[ssl=] )
|
||||
intl? ( dev-libs/icu )
|
||||
iodbc? ( dev-db/libiodbc )
|
||||
kerberos? ( virtual/krb5 )
|
||||
kolab? ( >=net-libs/c-client-2004g-r1 )
|
||||
ldap? ( >=net-nds/openldap-1.2.11 )
|
||||
ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 )
|
||||
libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) )
|
||||
mssql? ( dev-db/freetds[mssql] )
|
||||
!mysqlnd? (
|
||||
mysql? ( virtual/mysql )
|
||||
mysqli? ( >=virtual/mysql-4.1 )
|
||||
)
|
||||
nls? ( sys-devel/gettext )
|
||||
oci8-instant-client? ( dev-db/oracle-instantclient-basic )
|
||||
odbc? ( >=dev-db/unixODBC-1.8.13 )
|
||||
postgres? ( dev-db/postgresql-base )
|
||||
qdbm? ( dev-db/qdbm )
|
||||
readline? ( sys-libs/readline )
|
||||
recode? ( app-text/recode )
|
||||
sharedmem? ( dev-libs/mm )
|
||||
simplexml? ( >=dev-libs/libxml2-2.6.8 )
|
||||
snmp? ( >=net-analyzer/net-snmp-5.2 )
|
||||
soap? ( >=dev-libs/libxml2-2.6.8 )
|
||||
spell? ( >=app-text/aspell-0.50 )
|
||||
sqlite3? ( >=dev-db/sqlite-3.7.6.3 )
|
||||
ssl? ( >=dev-libs/openssl-0.9.7 )
|
||||
sybase-ct? ( dev-db/freetds )
|
||||
tidy? ( app-text/htmltidy )
|
||||
truetype? (
|
||||
=media-libs/freetype-2*
|
||||
>=media-libs/t1lib-5.0.0
|
||||
!gd? (
|
||||
virtual/jpeg media-libs/libpng sys-libs/zlib )
|
||||
)
|
||||
unicode? ( dev-libs/oniguruma )
|
||||
wddx? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xml? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv )
|
||||
xmlreader? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xmlwriter? ( >=dev-libs/libxml2-2.6.8 )
|
||||
xpm? (
|
||||
x11-libs/libXpm
|
||||
virtual/jpeg
|
||||
media-libs/libpng sys-libs/zlib
|
||||
)
|
||||
xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 )
|
||||
zip? ( sys-libs/zlib )
|
||||
zlib? ( sys-libs/zlib )
|
||||
virtual/mta
|
||||
"
|
||||
|
||||
php="=${CATEGORY}/${PF}"
|
||||
|
||||
REQUIRED_USE="
|
||||
truetype? ( gd )
|
||||
cjk? ( gd )
|
||||
exif? ( gd )
|
||||
|
||||
xpm? ( gd )
|
||||
gd? ( zlib )
|
||||
simplexml? ( xml )
|
||||
soap? ( xml )
|
||||
wddx? ( xml )
|
||||
xmlrpc? ( || ( xml iconv ) )
|
||||
xmlreader? ( xml )
|
||||
xsl? ( xml )
|
||||
ldap-sasl? ( ldap )
|
||||
kolab? ( imap )
|
||||
mhash? ( hash )
|
||||
phar? ( hash )
|
||||
mysqlnd? ( || (
|
||||
mysql
|
||||
mysqli
|
||||
pdo
|
||||
) )
|
||||
|
||||
qdbm? ( !gdbm )
|
||||
readline? ( !libedit )
|
||||
recode? ( !imap !mysql !mysqli )
|
||||
sharedmem? ( !threads )
|
||||
|
||||
!cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
[[ -n $SUHOSIN_VERSION ]] && RDEPEND="${RDEPEND} suhosin? (
|
||||
=${CATEGORY}/${PN}-${SLOT}*[unicode] )"
|
||||
|
||||
DEPEND="${DEPEND}
|
||||
sys-devel/flex
|
||||
>=sys-devel/m4-1.4.3
|
||||
>=sys-devel/libtool-1.5.18"
|
||||
|
||||
# They are in PDEPEND because we need PHP installed first!
|
||||
PDEPEND="doc? ( app-doc/php-docs )"
|
||||
|
||||
# No longer depend on the extension. The suhosin USE flag only installs the
|
||||
# patch
|
||||
#[[ -n $SUHOSIN_VERSION ]] && PDEPEND="${PDEPEND} suhosin? ( dev-php${PHP_MV}/suhosin )"
|
||||
|
||||
# Allow users to install production version if they want to
|
||||
|
||||
case "${PHP_INI_VERSION}" in
|
||||
production|development)
|
||||
;;
|
||||
*)
|
||||
PHP_INI_VERSION="development"
|
||||
;;
|
||||
esac
|
||||
|
||||
PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}"
|
||||
PHP_INI_FILE="php.ini"
|
||||
|
||||
want_apache
|
||||
|
||||
# eblit-core
|
||||
# Usage: <function> [version] [eval]
|
||||
# Main eblit engine
|
||||
eblit-core() {
|
||||
[[ -z $FILESDIR ]] && FILESDIR="$(dirname $EBUILD)/files"
|
||||
local e v func=$1 ver=$2 eval_=$3
|
||||
for v in ${ver:+-}${ver} -${PVR} -${PV} "" ; do
|
||||
e="${FILESDIR}/eblits/${func}${v}.eblit"
|
||||
if [[ -e ${e} ]] ; then
|
||||
. "${e}"
|
||||
[[ ${eval_} == 1 ]] && eval "${func}() { eblit-run ${func} ${ver} ; }"
|
||||
return 0
|
||||
fi
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# eblit-include
|
||||
# Usage: [--skip] <function> [version]
|
||||
# Includes an "eblit" -- a chunk of common code among ebuilds in a given
|
||||
# package so that its functions can be sourced and utilized within the
|
||||
# ebuild.
|
||||
eblit-include() {
|
||||
local skipable=false r=0
|
||||
[[ $1 == "--skip" ]] && skipable=true && shift
|
||||
[[ $1 == pkg_* ]] && skipable=true
|
||||
|
||||
[[ -z $1 ]] && die "Usage: eblit-include <function> [version]"
|
||||
eblit-core $1 $2
|
||||
r="$?"
|
||||
${skipable} && return 0
|
||||
[[ "$r" -gt "0" ]] && die "Could not locate requested eblit '$1' in ${FILESDIR}/eblits/"
|
||||
}
|
||||
|
||||
# eblit-run-maybe
|
||||
# Usage: <function>
|
||||
# Runs a function if it is defined in an eblit
|
||||
eblit-run-maybe() {
|
||||
[[ $(type -t "$@") == "function" ]] && "$@"
|
||||
}
|
||||
|
||||
# eblit-run
|
||||
# Usage: <function> [version]
|
||||
# Runs a function defined in an eblit
|
||||
eblit-run() {
|
||||
eblit-include --skip common v2
|
||||
eblit-include "$@"
|
||||
eblit-run-maybe eblit-$1-pre
|
||||
eblit-${PN}-$1
|
||||
eblit-run-maybe eblit-$1-post
|
||||
}
|
||||
|
||||
# eblit-pkg
|
||||
# Usage: <phase> [version]
|
||||
# Includes the given functions AND evals them so they're included in the binpkgs
|
||||
eblit-pkg() {
|
||||
[[ -z $1 ]] && die "Usage: eblit-pkg <phase> [version]"
|
||||
eblit-core $1 $2 1
|
||||
}
|
||||
|
||||
eblit-pkg pkg_setup v3
|
||||
|
||||
src_prepare() { eblit-run src_prepare v4 ; }
|
||||
src_configure() { eblit-run src_configure v54 ; }
|
||||
src_compile() { eblit-run src_compile v2 ; }
|
||||
src_install() { eblit-run src_install v3 ; }
|
||||
src_test() { eblit-run src_test v1 ; }
|
||||
|
||||
#Do not use eblit for this because it will not get sourced when installing from
|
||||
#binary package (bug #380845)
|
||||
pkg_postinst() {
|
||||
# Output some general info to the user
|
||||
if use apache2 ; then
|
||||
APACHE2_MOD_DEFINE="PHP5"
|
||||
APACHE2_MOD_CONF="70_mod_php5"
|
||||
apache-module_pkg_postinst
|
||||
fi
|
||||
|
||||
# Create the symlinks for php
|
||||
for m in ${SAPIS}; do
|
||||
[[ ${m} == 'embed' ]] && continue;
|
||||
if use $m ; then
|
||||
local ci=$(eselect php show $m)
|
||||
if [[ -z $ci ]]; then
|
||||
eselect php set $m php${SLOT}
|
||||
einfo "Switched ${m} to use php:${SLOT}"
|
||||
einfo
|
||||
elif [[ $ci != "php${SLOT}" ]] ; then
|
||||
elog "To switch $m to use php:${SLOT}, run"
|
||||
elog " eselect php set $m php${SLOT}"
|
||||
elog
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
elog "Make sure that PHP_TARGETS in /etc/make.conf includes php${SLOT/./-} in order"
|
||||
elog "to compile extensions for the ${SLOT} ABI"
|
||||
elog
|
||||
if ! use readline && use cli ; then
|
||||
ewarn "Note that in order to use php interactivly, you need to enable"
|
||||
ewarn "the readline USE flag or php -a will hang"
|
||||
fi
|
||||
elog
|
||||
elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version."
|
||||
elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either"
|
||||
elog "'production' or 'development' in /etc/make.conf"
|
||||
ewarn "Both versions of php.ini can be found in /usr/share/doc/${PF}"
|
||||
|
||||
# check for not yet migrated old style config dirs
|
||||
ls "${ROOT}"/etc/php/*-php5 &>/dev/null
|
||||
if [[ $? -eq 0 ]]; then
|
||||
ewarn "Make sure to migrate your config files, starting with php-5.3.4 and php-5.2.16 config"
|
||||
ewarn "files are now kept at ${ROOT}etc/php/{apache2,cli,cgi,fpm}-php5.x"
|
||||
fi
|
||||
elog
|
||||
elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:"
|
||||
elog "http://www.gentoo.org/proj/en/php/php-upgrading.xml"
|
||||
elog
|
||||
|
||||
if ( [[ -z SUHOSIN_VERSION ]] && use suhosin && version_is_at_least 5.3.6_rc1 ) ; then
|
||||
ewarn "The suhosin USE flag now only installs the suhosin patch!"
|
||||
ewarn "If you want the suhosin extension, make sure you install"
|
||||
ewarn " dev-php/suhosin"
|
||||
ewarn
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
src/dee-filter.h | 2 +-
|
||||
src/dee-model-reader.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/dee-filter.h b/src/dee-filter.h
|
||||
index de8d252..327f512 100644
|
||||
--- a/src/dee-filter.h
|
||||
+++ b/src/dee-filter.h
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
-typedef struct _DeeFilter DeeFilter;
|
||||
+//typedef struct _DeeFilter DeeFilter;
|
||||
|
||||
/**
|
||||
* DeeFilterMapFunc:
|
||||
diff --git a/src/dee-model-reader.h b/src/dee-model-reader.h
|
||||
index a249149..dd23de6 100644
|
||||
--- a/src/dee-model-reader.h
|
||||
+++ b/src/dee-model-reader.h
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
-typedef struct _DeeFilter DeeFilter;
|
||||
+//typedef struct _DeeFilter DeeFilter;
|
||||
|
||||
/**
|
||||
* DeeModelReaderFunc:
|
||||
@ -0,0 +1,217 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1b.ebuild,v 1.1 2012/04/26 14:58:17 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils flag-o-matic toolchain-funcs
|
||||
|
||||
REV="1.7"
|
||||
DESCRIPTION="full-strength general purpose cryptography library (including SSL v2/v3 and TLS v1)"
|
||||
HOMEPAGE="http://www.openssl.org/"
|
||||
SRC_URI="mirror://openssl/source/${P}.tar.gz
|
||||
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/~checkout~/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}"
|
||||
|
||||
LICENSE="openssl"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test vanilla zlib"
|
||||
|
||||
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
|
||||
# our libssl.a depends on libz.a/etc... at runtime.
|
||||
LIB_DEPEND="gmp? ( dev-libs/gmp[static-libs(+)] )
|
||||
zlib? ( sys-libs/zlib[static-libs(+)] )
|
||||
kerberos? ( app-crypt/mit-krb5 )"
|
||||
# The blocks are temporary just to make sure people upgrade to a
|
||||
# version that lack runtime version checking. We'll drop them in
|
||||
# the future.
|
||||
RDEPEND="static-libs? ( ${LIB_DEPEND} )
|
||||
!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
|
||||
!<net-misc/openssh-5.9_p1-r4
|
||||
!<net-libs/neon-0.29.6-r1"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-apps/diffutils
|
||||
>=dev-lang/perl-5
|
||||
test? ( sys-devel/bc )"
|
||||
PDEPEND="app-misc/ca-certificates"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${P}.tar.gz
|
||||
cp "${DISTDIR}"/${PN}-c_rehash.sh.${REV} "${WORKDIR}"/c_rehash || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Make sure we only ever touch Makefile.org and avoid patching a file
|
||||
# that gets blown away anyways by the Configure script in src_configure
|
||||
rm -f Makefile
|
||||
|
||||
if ! use vanilla ; then
|
||||
epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421
|
||||
epatch "${FILESDIR}"/${PN}-1.0.0d-fbsd-amd64.patch #363089
|
||||
epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743
|
||||
epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch
|
||||
epatch "${FILESDIR}"/${PN}-1.0.1-ipv6.patch
|
||||
epatch_user #332661
|
||||
fi
|
||||
|
||||
# disable fips in the build
|
||||
# make sure the man pages are suffixed #302165
|
||||
# don't bother building man pages if they're disabled
|
||||
sed -i \
|
||||
-e '/DIRS/s: fips : :g' \
|
||||
-e '/^MANSUFFIX/s:=.*:=ssl:' \
|
||||
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
|
||||
-e $(has noman FEATURES \
|
||||
&& echo '/^install:/s:install_docs::' \
|
||||
|| echo '/^MANDIR=/s:=.*:=/usr/share/man:') \
|
||||
Makefile.org \
|
||||
|| die
|
||||
# show the actual commands in the log
|
||||
sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared
|
||||
|
||||
# allow openssl to be cross-compiled
|
||||
cp "${FILESDIR}"/gentoo.config-1.0.0 gentoo.config || die
|
||||
chmod a+rx gentoo.config
|
||||
|
||||
append-flags -fno-strict-aliasing
|
||||
append-flags $(test-flags-CC -Wa,--noexecstack)
|
||||
|
||||
sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906
|
||||
./config --test-sanity || die "I AM NOT SANE"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
unset APPS #197996
|
||||
unset SCRIPTS #312551
|
||||
unset CROSS_COMPILE #311473
|
||||
|
||||
tc-export CC AR RANLIB RC
|
||||
|
||||
# Clean out patent-or-otherwise-encumbered code
|
||||
# Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher)
|
||||
# IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm
|
||||
# EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography
|
||||
# MDC2: Expired http://en.wikipedia.org/wiki/MDC-2
|
||||
# RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5
|
||||
|
||||
use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
|
||||
echoit() { echo "$@" ; "$@" ; }
|
||||
|
||||
local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
|
||||
|
||||
local sslout=$(./gentoo.config)
|
||||
einfo "Use configuration ${sslout:-(openssl knows best)}"
|
||||
local config="Configure"
|
||||
[[ -z ${sslout} ]] && config="config"
|
||||
echoit \
|
||||
./${config} \
|
||||
${sslout} \
|
||||
$(use sse2 || echo "no-sse2") \
|
||||
enable-camellia \
|
||||
$(use_ssl !bindist ec) \
|
||||
enable-idea \
|
||||
enable-mdc2 \
|
||||
$(use_ssl !bindist rc5) \
|
||||
enable-tlsext \
|
||||
$(use_ssl gmp gmp -lgmp) \
|
||||
$(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \
|
||||
$(use_ssl rfc3779) \
|
||||
$(use_ssl zlib) \
|
||||
--prefix=/usr \
|
||||
--openssldir=/etc/ssl \
|
||||
--libdir=$(get_libdir) \
|
||||
shared threads \
|
||||
|| die
|
||||
|
||||
# Clean out hardcoded flags that openssl uses
|
||||
local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \
|
||||
-e 's:^CFLAG=::' \
|
||||
-e 's:-fomit-frame-pointer ::g' \
|
||||
-e 's:-O[0-9] ::g' \
|
||||
-e 's:-march=[-a-z0-9]* ::g' \
|
||||
-e 's:-mcpu=[-a-z0-9]* ::g' \
|
||||
-e 's:-m[a-z0-9]* ::g' \
|
||||
)
|
||||
sed -i \
|
||||
-e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \
|
||||
-e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \
|
||||
Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# depend is needed to use $confopts; it also doesn't matter
|
||||
# that it's -j1 as the code itself serializes subdirs
|
||||
emake -j1 depend
|
||||
emake all
|
||||
# rehash is needed to prep the certs/ dir; do this
|
||||
# separately to avoid parallel build issues.
|
||||
emake rehash
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALL_PREFIX="${D}" install
|
||||
dobin "${WORKDIR}"/c_rehash #333117
|
||||
dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el
|
||||
dohtml -r doc/*
|
||||
use rfc3779 && dodoc engines/ccgost/README.gost
|
||||
|
||||
# This is crappy in that the static archives are still built even
|
||||
# when USE=static-libs. But this is due to a failing in the openssl
|
||||
# build system: the static archives are built as PIC all the time.
|
||||
# Only way around this would be to manually configure+compile openssl
|
||||
# twice; once with shared lib support enabled and once without.
|
||||
use static-libs || rm -f "${D}"/usr/lib*/lib*.a
|
||||
|
||||
# create the certs directory
|
||||
dodir /etc/ssl/certs
|
||||
cp -RP certs/* "${D}"/etc/ssl/certs/ || die
|
||||
rm -r "${D}"/etc/ssl/certs/{demo,expired}
|
||||
|
||||
# Namespace openssl programs to prevent conflicts with other man pages
|
||||
cd "${D}"/usr/share/man
|
||||
local m d s
|
||||
for m in $(find . -type f | xargs grep -L '#include') ; do
|
||||
d=${m%/*} ; d=${d#./} ; m=${m##*/}
|
||||
[[ ${m} == openssl.1* ]] && continue
|
||||
[[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!"
|
||||
mv ${d}/{,ssl-}${m}
|
||||
# fix up references to renamed man pages
|
||||
sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m}
|
||||
ln -s ssl-${m} ${d}/openssl-${m}
|
||||
# locate any symlinks that point to this man page ... we assume
|
||||
# that any broken links are due to the above renaming
|
||||
for s in $(find -L ${d} -type l) ; do
|
||||
s=${s##*/}
|
||||
rm -f ${d}/${s}
|
||||
ln -s ssl-${m} ${d}/ssl-${s}
|
||||
ln -s ssl-${s} ${d}/openssl-${s}
|
||||
done
|
||||
done
|
||||
[[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :("
|
||||
|
||||
dodir /etc/sandbox.d #254521
|
||||
echo 'SANDBOX_PREDICT="/dev/crypto"' > "${D}"/etc/sandbox.d/10openssl
|
||||
|
||||
diropts -m0700
|
||||
keepdir /etc/ssl/private
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
|
||||
preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
ebegin "Running 'c_rehash ${ROOT}etc/ssl/certs/' to rebuild hashes #333069"
|
||||
c_rehash "${ROOT}etc/ssl/certs" >/dev/null
|
||||
eend $?
|
||||
|
||||
has_version ${CATEGORY}/${PN}:0.9.8 && return 0
|
||||
preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8
|
||||
}
|
||||
@ -1,4 +1,2 @@
|
||||
DIST libjpeg-turbo-1.1.1.tar.gz 1444529 RMD160 d70979dabe05b8eb74cddaaf0ffbd4b9fbaba41a SHA1 131cef514c34e0b3f6952000968796d5a87a59e9 SHA256 553b1f5a968fb9efc089623ed99be2aa6bc21586be92eb04848489c91a63f1e2
|
||||
DIST libjpeg-turbo-1.2.0.tar.gz 1752925 RMD160 d60a7de07c3164aeb1800ba21a86782e195f00f8 SHA1 4ab00afc9a8d54cd2e7a67aacb9c49e01a8bccac SHA256 629db2a9b1295a1b0e5fa8dddda36c5da61a90536bef8295e0b209cbcd50f98e
|
||||
DIST libjpeg8_8c-1.debian.tar.gz 13756 RMD160 7ceb995b47678bc841e217deaa32f05d70f8d80e SHA1 0c95ebe091e3d535d9d6d8c128ec8bd07e0542fb SHA256 2d45eb7302d2c9a5b6cf12784629ec1bdbbb271a10d600532e5fbde3c19ea765
|
||||
DIST libjpeg8_8d-1.debian.tar.gz 13676 RMD160 9a60fe29a866b76935f8e26c7bf90324e1dc0ce6 SHA1 00b45ec61555c86da250f3a73823c7d46cfd81aa SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.1.1.ebuild,v 1.5 2011/06/18 15:41:08 phajdan.jr Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit libtool toolchain-funcs
|
||||
|
||||
DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library"
|
||||
HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
|
||||
mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8c-1.debian.tar.gz"
|
||||
|
||||
LICENSE="as-is LGPL-2.1 wxWinLL-3.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="static-libs"
|
||||
|
||||
NASM_DEPEND="dev-lang/nasm"
|
||||
RDEPEND="!media-libs/jpeg:0"
|
||||
DEPEND="${RDEPEND}
|
||||
amd64? ( ${NASM_DEPEND} )
|
||||
x86? ( ${NASM_DEPEND} )
|
||||
amd64-linux? ( ${NASM_DEPEND} )
|
||||
x86-linux? ( ${NASM_DEPEND} )"
|
||||
|
||||
DOCS=( BUILDING.txt ChangeLog.txt example.c README-turbo.txt )
|
||||
|
||||
src_prepare() {
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
--with-jpeg8
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
cd ../debian/extra || die
|
||||
emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake test
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -exec rm -f {} +
|
||||
|
||||
cd ../debian/extra || die
|
||||
emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
|
||||
INSTALL="install -m755" INSTALLDIR="install -d -m755" \
|
||||
install
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue