root
12 years ago
parent
3606b56c1c
commit
083d56f7af
@ -1,19 +1,19 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
Hash: SHA1
|
||||
|
||||
DIST eselect-python-20091230.tar.bz2 5476 RMD160 33d2648f69c2b402e2e482a218d7a22e1c167aed SHA1 6294603bb921924ecb74b006c5ed313b48489065 SHA256 34df248d55f656b5bf251b087d64a81be985ca9a0b1444d221d65a975853c49e
|
||||
DIST eselect-python-20100321.tar.bz2 6006 RMD160 7c24095bcac681a1e4e048504ac38641bbd569df SHA1 ab5539e789825bdb131d02ba4bd756b535b9bbde SHA256 b287e910abd46b865ebeb303a4c61aa53dd70185efbe42a296af556559173523
|
||||
DIST eselect-python-20111108.tar.bz2 64959 RMD160 cdab063a3dad4c8ac9aaeb49c9bf00dce07df761 SHA1 e762805358ace163d76e677db1b1df60b744b772 SHA256 34d7618808a3c1d22e6763bc6c67d5ae47a1fa371f5e91de95a911da9aceba5e
|
||||
EBUILD eselect-python-20091230.ebuild 1347 RMD160 690c40bfe41c378f55e4198820b00c39ee6e3ea3 SHA1 aa4fffc25280b32f62b2369bd1fc4f9c8e847f76 SHA256 4ed3356749d4d28560a70b650911da6e390a051ab52d13af0ea4be00818b12f5
|
||||
EBUILD eselect-python-20100321.ebuild 1318 RMD160 db6bbd9c85c03034775d64f4bcd1279c085c8fdf SHA1 d7f04bea155f923e06c2a113b4d44e44987761db SHA256 7e668f3a823aabd9fa3d1b089a8ae523b62dafb487147f120f1c608a594703e1
|
||||
EBUILD eselect-python-20111108.ebuild 1526 RMD160 851d54ca71dcee6303e98b1492b95c6800e61707 SHA1 2071aacc34f610338b4b8aade47946be269a9d73 SHA256 376608f4721dd3ab7729533e3c7fab2ff9ac6a313a5446b81376e33201396d07
|
||||
EBUILD eselect-python-99999999.ebuild 1526 RMD160 39a52236ccb703f20082ddff04704a884af5956f SHA1 90674a8d1dfbbaf81c2171600060cecfe1808f95 SHA256 7dcfe7fad20236089fa85bdb79be926ffd31db142d22be4fd9d6e8bfbd90d7c2
|
||||
MISC ChangeLog 9916 RMD160 6233ea03336bcf284ed0f9e1f5b735ba09bc9e92 SHA1 731bc91c97ee0c17173e17725c1510a3204869ac SHA256 9c3aea0fdc91e9e5e370965fea7c4bf17ff890dd70e530d1d440df0bd73b203b
|
||||
EBUILD eselect-python-20111108.ebuild 1540 RMD160 737f8043e49f0ac187e87a8ac0280c8463344f11 SHA1 06cc15918beb718287ce81756b321a26cc085793 SHA256 2b57b142e14d7e7f4ef2fc4cc404a2503893a401f6660f7f7a26e963a029c032
|
||||
EBUILD eselect-python-99999999.ebuild 1540 RMD160 163a1d105e01c53260a2ab49ec2d605354a557ae SHA1 0f92df5008733f35e0d2accb7899b7de51e77184 SHA256 9570310913e98f8add41ff1c635b0cd0dffeb011cd32b45df6e4f16e2d5043f0
|
||||
MISC ChangeLog 10059 RMD160 9c3001ce7a96047f2ca368048b28c2d0670010fc SHA1 c7113abd0e224836930cbe6bbd0439cdc80a57e4 SHA256 70be607ac27e6b680ca66f9113899f8a8a333a0be3c289d3741a23b0fb444fdb
|
||||
MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.18 (GNU/Linux)
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iF4EAREIAAYFAk65z3kACgkQaC/OocHi7JYwkAD/cMhsP5XyOLOGV2VS63K/AHwS
|
||||
qhoiP67Mro3uPoNnIq0A/3S31RlYPytC3X1mp6ZmCkch3qulHg42dFGojfioIScM
|
||||
=qFG1
|
||||
iEYEARECAAYFAk+ZYWYACgkQvFcC4BYPU0rMiwCdF0Hrzd0bXwFWIy79ErFEFTZu
|
||||
Ub4AnifIARQz2Mq18woHfRfFspCrfK5w
|
||||
=ThHO
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA256
|
||||
Hash: SHA1
|
||||
|
||||
AUX cpio-2.11-stat.patch 575 RMD160 43995af9fdc48b87ab8eaa231ed15baa69fffbab SHA1 afd3992f945876552531aeb8deb3208951871341 SHA256 b3d317e3c5705d7f9e503f56540baf3cb6dd1d0e9be0261151a5b08378c2d98c
|
||||
DIST cpio-2.11.tar.bz2 1018483 RMD160 52507b8ba556dca888ce1179cfda10f9549ea9ab SHA1 6f1934b0079dc1e85ddff89cabdf01adb3a74abb SHA256 bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd
|
||||
EBUILD cpio-2.11.ebuild 866 RMD160 951414567f924b01f4e7e4a14596a0893af62acc SHA1 978ede667d56b688358e4f2d9aa3c05fd889705b SHA256 3e6e3e827218a9a220e02a2e24261fd6888f56f8297f6e792245399b2fe1e271
|
||||
MISC ChangeLog 15376 RMD160 bb61981116a3adea1022f4fca894389afac54a8d SHA1 04a1b6db2840b7bc8da9d16b56493856340bad58 SHA256 e9765444b937231b5ea194d009c09b24f5f4600f97fcb20f9ef8d64dc6556ada
|
||||
EBUILD cpio-2.11.ebuild 880 RMD160 b133250227e752326df91023fb6fe116222497f2 SHA1 7cadbce060b609eadd5e96345c821f8f4bedc495 SHA256 1346b3206a48f95032290b86a0d75e5cdda22094a43a40f477088fbde544e7ae
|
||||
MISC ChangeLog 15471 RMD160 e815a0ca164073ce5d0d51ef1759978d1e99dadc SHA1 15cf8678cff09e5b93ea5dff792d2a7202e031d4 SHA256 6cd257e9753dae4778dec679e5e7f524950b8ec7e7f76b3a1a7b986019131a0a
|
||||
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.16 (GNU/Linux)
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iF4EAREIAAYFAkyxArcACgkQTwhj9JtAlp49JAEAplx+554VCPztqkqF3GWQ5rrk
|
||||
3VSTavGmhGUBBVAg20UBAJBjfrwdMuCuRpwEiTyAIM+ae9KhOsOP5Yz9Xsw2SFkM
|
||||
=BLWS
|
||||
iEYEARECAAYFAk+ZP7MACgkQvFcC4BYPU0om4QCdHD4dJ8YazCemO46r+Kbdt4J7
|
||||
gqsAoLJxRxTH2TfeOgtiHjbbXkY3qZwq
|
||||
=h+O2
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -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,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
|
||||
}
|
||||
@ -1,15 +1,16 @@
|
||||
-----BEGIN PGP SIGNED MESSAGE-----
|
||||
Hash: SHA512
|
||||
|
||||
AUX dee-1.0.10-gcc-4.5.patch 683 RMD160 3e38c65f7c0fa2860e87a8c6a721a044ec98c0e4 SHA1 84867fb5dfd5a5c0162d27be3a68f5db9f38cf5b SHA256 820cbadcc01ab07151646460441a33f4fd6701b465098e8b2addd3d4d7758bf4
|
||||
AUX dee-1.0.10-vapigen.patch 633 RMD160 a5c54072d0ec1a9c40925503a01e649af91e604d SHA1 7e104e553051dccdad4062e752fc0eca0f601636 SHA256 44fa9563cb03712ed5614fd6d92521ebea3af3e4ea57b3e85c790eacff7f3c97
|
||||
DIST dee-1.0.10.tar.gz 666843 RMD160 ca030264de8600f7de48cfc53557d0d9d3ecf04d SHA1 57335b5eb15d56926f0123f239053eb2a8e1c005 SHA256 5b780a1655ad88e8fa0aef88d0913b2bb8754530514ad47d6bb985d39981401c
|
||||
EBUILD dee-1.0.10.ebuild 1171 RMD160 afde545295e8ca3e89e0d51a0c7b195cabada6b6 SHA1 8b77c6a948acd716d1add60e87a3f1d37c7502f2 SHA256 a7b65b94667c34907987a7dc973f2fbd2f86718d846d8e961b540e3804b9200a
|
||||
MISC ChangeLog 439 RMD160 113d05e587242befd01fa4da025400f36129c417 SHA1 fc4c4b51bc9453f8db8edc53f0e829c1bf56916a SHA256 30396231f6af94328aaca630f18cde4f4eaffb3ccd3e50a71fcc3361c77c69c9
|
||||
EBUILD dee-1.0.10.ebuild 1206 RMD160 6ca237f06905809b787d6a14311811a751aa5703 SHA1 3be618b8b0accdf94dd3ec21ecdc6a2e13749d31 SHA256 38ceeb1457c54236aee5417e20717755037ec0b015405457b7bfcf242aa35c82
|
||||
MISC ChangeLog 625 RMD160 be798ef50cc85cf694e87e5999c1e708d2b960d2 SHA1 b3d1e2476ed9c677a9113a8abf52c2ce19f75ec6 SHA256 1214b1d5cd637cc3c2701e217d71bda7e47522aedd379ef2be0c321e28e09d07
|
||||
MISC metadata.xml 201 RMD160 a6c5202673c0843bd9d1453b78b3f6bddc62a1f7 SHA1 6c7c52b9cddff4c6507fe6e49be0bbd53611d236 SHA256 180014e727f4e39b95bfeadf7661f97f2a0c8fe30658a82cd676fac065c7b3c9
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
|
||||
iEYEAREKAAYFAk+WPIwACgkQgAnW8HDreRZSbACbBZAd3TpwT0RLRWqYBC/Neq0+
|
||||
cEwAoJUNBUTMiQFZTDYu9+9vxI8iiFXy
|
||||
=7d0c
|
||||
iEYEAREKAAYFAk+ZU3gACgkQgAnW8HDreRaPqgCgzt3ECO23/byPPR/tbphVB9aB
|
||||
KOMAoJrHaxpb48Z40OzwID2rgH+6Ej3M
|
||||
=VemI
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue