diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-26 11:53:14 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-04-26 11:53:14 +0000 |
| commit | 20189608c6a1a91a25244b22b0e3da90a4d03f89 (patch) | |
| tree | 23092c41f129dcd9373027d6d47195168c9cc569 /app-office/libreoffice | |
| parent | Stable on ppc wrt bug#411449. (diff) | |
| download | gentoo-2-20189608c6a1a91a25244b22b0e3da90a4d03f89.tar.gz gentoo-2-20189608c6a1a91a25244b22b0e3da90a4d03f89.tar.bz2 gentoo-2-20189608c6a1a91a25244b22b0e3da90a4d03f89.zip | |
Stable on ppc wrt bug#411449. Cleanup.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
26 files changed, 27 insertions, 1734 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index 2221d956bc27..814f16080638 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,30 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.289 2012/04/24 07:16:41 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.290 2012/04/26 11:53:14 scarabeus Exp $ + + 26 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> + -files/libreoffice-3.3.1-neon_remove_SSPI_support.diff, + -files/libreoffice-3.4.1-salfix.diff, -files/libreoffice-3.5-junit.patch, + -files/libreoffice-3.5.1-kde-4.8.1-namespace.patch, + -files/libreoffice-32b-qt4-libdir.patch, + -files/libreoffice-append-no-avx.patch, + -files/libreoffice-as-needed-gtk.patch, + -files/libreoffice-binfilter-as-needed.patch, + -files/libreoffice-check-for-avx.patch, + -files/libreoffice-gbuild-use-cxxflags.patch, + -files/libreoffice-honor-strip.patch, + -files/libreoffice-installed-files-permissions.patch, + -files/libreoffice-java.patch, -files/libreoffice-kde48.patch, + -files/libreoffice-kill-cppunit.patch, + -files/libreoffice-libdb5-fix-check.diff, + -files/libreoffice-poppler-0.18.0-2.patch, + -files/libreoffice-poppler-0.18.0.patch, + -files/libreoffice-solenv-build-crash.patch, -files/libreoffice-svx.patch, + -files/libreoffice-translate-toolkit-parallel-solenv.patch, + -files/libreoffice-vbaobj-visibility-fix.patch, + -libreoffice-3.4.3.2-r1.ebuild, -libreoffice-3.4.5.2.ebuild, + libreoffice-3.5.2.2.ebuild: + Stable on ppc wrt bug#411449. Cleanup. 24 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-9999-r2.ebuild: Add back the cppunit to depend as it is configure.in unconditionaly checked diff --git a/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff b/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff deleted file mode 100644 index 4230374bb941..000000000000 --- a/app-office/libreoffice/files/libreoffice-3.3.1-neon_remove_SSPI_support.diff +++ /dev/null @@ -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(), diff --git a/app-office/libreoffice/files/libreoffice-3.4.1-salfix.diff b/app-office/libreoffice/files/libreoffice-3.4.1-salfix.diff deleted file mode 100644 index 90df8db5c162..000000000000 --- a/app-office/libreoffice/files/libreoffice-3.4.1-salfix.diff +++ /dev/null @@ -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); diff --git a/app-office/libreoffice/files/libreoffice-3.5-junit.patch b/app-office/libreoffice/files/libreoffice-3.5-junit.patch deleted file mode 100644 index d1916c34ea02..000000000000 --- a/app-office/libreoffice/files/libreoffice-3.5-junit.patch +++ /dev/null @@ -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 diff --git a/app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch b/app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch deleted file mode 100644 index 0b3d69c82bc0..000000000000 --- a/app-office/libreoffice/files/libreoffice-3.5.1-kde-4.8.1-namespace.patch +++ /dev/null @@ -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 - diff --git a/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch b/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch deleted file mode 100644 index 1b0c7a604ffb..000000000000 --- a/app-office/libreoffice/files/libreoffice-32b-qt4-libdir.patch +++ /dev/null @@ -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" diff --git a/app-office/libreoffice/files/libreoffice-append-no-avx.patch b/app-office/libreoffice/files/libreoffice-append-no-avx.patch deleted file mode 100644 index 18563055f44b..000000000000 --- a/app-office/libreoffice/files/libreoffice-append-no-avx.patch +++ /dev/null @@ -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 - diff --git a/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch b/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch deleted file mode 100644 index ced69e2005b7..000000000000 --- a/app-office/libreoffice/files/libreoffice-as-needed-gtk.patch +++ /dev/null @@ -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) \ - )) -
\ No newline at end of file diff --git a/app-office/libreoffice/files/libreoffice-binfilter-as-needed.patch b/app-office/libreoffice/files/libreoffice-binfilter-as-needed.patch deleted file mode 100644 index 1dddb0edf5f5..000000000000 --- a/app-office/libreoffice/files/libreoffice-binfilter-as-needed.patch +++ /dev/null @@ -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 - diff --git a/app-office/libreoffice/files/libreoffice-check-for-avx.patch b/app-office/libreoffice/files/libreoffice-check-for-avx.patch deleted file mode 100644 index 57f479f7b67f..000000000000 --- a/app-office/libreoffice/files/libreoffice-check-for-avx.patch +++ /dev/null @@ -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" ); diff --git a/app-office/libreoffice/files/libreoffice-gbuild-use-cxxflags.patch b/app-office/libreoffice/files/libreoffice-gbuild-use-cxxflags.patch deleted file mode 100644 index e7ad1222a37f..000000000000 --- a/app-office/libreoffice/files/libreoffice-gbuild-use-cxxflags.patch +++ /dev/null @@ -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)),) diff --git a/app-office/libreoffice/files/libreoffice-honor-strip.patch b/app-office/libreoffice/files/libreoffice-honor-strip.patch deleted file mode 100644 index 1d15802ede49..000000000000 --- a/app-office/libreoffice/files/libreoffice-honor-strip.patch +++ /dev/null @@ -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 diff --git a/app-office/libreoffice/files/libreoffice-installed-files-permissions.patch b/app-office/libreoffice/files/libreoffice-installed-files-permissions.patch deleted file mode 100644 index fd61cb4ca549..000000000000 --- a/app-office/libreoffice/files/libreoffice-installed-files-permissions.patch +++ /dev/null @@ -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 diff --git a/app-office/libreoffice/files/libreoffice-java.patch b/app-office/libreoffice/files/libreoffice-java.patch deleted file mode 100644 index ac5b394de356..000000000000 --- a/app-office/libreoffice/files/libreoffice-java.patch +++ /dev/null @@ -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) - diff --git a/app-office/libreoffice/files/libreoffice-kde48.patch b/app-office/libreoffice/files/libreoffice-kde48.patch deleted file mode 100644 index a92df79a9d0e..000000000000 --- a/app-office/libreoffice/files/libreoffice-kde48.patch +++ /dev/null @@ -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 diff --git a/app-office/libreoffice/files/libreoffice-kill-cppunit.patch b/app-office/libreoffice/files/libreoffice-kill-cppunit.patch deleted file mode 100644 index 8cb1f9f8e230..000000000000 --- a/app-office/libreoffice/files/libreoffice-kill-cppunit.patch +++ /dev/null @@ -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) { diff --git a/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff b/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff deleted file mode 100644 index 0c59f0202d6b..000000000000 --- a/app-office/libreoffice/files/libreoffice-libdb5-fix-check.diff +++ /dev/null @@ -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]) diff --git a/app-office/libreoffice/files/libreoffice-poppler-0.18.0-2.patch b/app-office/libreoffice/files/libreoffice-poppler-0.18.0-2.patch deleted file mode 100644 index d627f9c9b1fb..000000000000 --- a/app-office/libreoffice/files/libreoffice-poppler-0.18.0-2.patch +++ /dev/null @@ -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 diff --git a/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch b/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch deleted file mode 100644 index 819deaf29e14..000000000000 --- a/app-office/libreoffice/files/libreoffice-poppler-0.18.0.patch +++ /dev/null @@ -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 diff --git a/app-office/libreoffice/files/libreoffice-solenv-build-crash.patch b/app-office/libreoffice/files/libreoffice-solenv-build-crash.patch deleted file mode 100644 index 979587f792b4..000000000000 --- a/app-office/libreoffice/files/libreoffice-solenv-build-crash.patch +++ /dev/null @@ -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 diff --git a/app-office/libreoffice/files/libreoffice-svx.patch b/app-office/libreoffice/files/libreoffice-svx.patch deleted file mode 100644 index d25d19257f5f..000000000000 --- a/app-office/libreoffice/files/libreoffice-svx.patch +++ /dev/null @@ -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 diff --git a/app-office/libreoffice/files/libreoffice-translate-toolkit-parallel-solenv.patch b/app-office/libreoffice/files/libreoffice-translate-toolkit-parallel-solenv.patch deleted file mode 100644 index 92c066fe17c4..000000000000 --- a/app-office/libreoffice/files/libreoffice-translate-toolkit-parallel-solenv.patch +++ /dev/null @@ -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 diff --git a/app-office/libreoffice/files/libreoffice-vbaobj-visibility-fix.patch b/app-office/libreoffice/files/libreoffice-vbaobj-visibility-fix.patch deleted file mode 100644 index 5739100d0d43..000000000000 --- a/app-office/libreoffice/files/libreoffice-vbaobj-visibility-fix.patch +++ /dev/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) \ diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild deleted file mode 100644 index b4d7edc7eb2b..000000000000 --- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild +++ /dev/null @@ -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 -} diff --git a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild b/app-office/libreoffice/libreoffice-3.4.5.2.ebuild deleted file mode 100644 index e28404a1458d..000000000000 --- a/app-office/libreoffice/libreoffice-3.4.5.2.ebuild +++ /dev/null @@ -1,520 +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.5.2.ebuild,v 1.13 2012/03/30 11:08:41 scarabeus Exp $ - -EAPI=4 - -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" -# PATCHSET="${P}-patchset-01.tar.xz" - -[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2" -inherit base autotools bash-completion-r1 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} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" - -# 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}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz" -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}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz" -ADDONS_SRC+=" ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip" -ADDONS_SRC+=" ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip" -ADDONS_SRC+=" http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2" -ADDONS_SRC+=" http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll" -SRC_URI+=" ${ADDONS_SRC}" - -unset ADDONS_URI -unset EXT_URI -unset ADDONS_SRC - -IUSE="binfilter +branding custom-cflags dbus debug eds gnome graphite -gstreamer gtk jemalloc kde mysql nsplugin odk opengl pdfimport python -test +vba webdav" -LICENSE="LGPL-3" -SLOT="0" -[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" - -COMMON_DEPEND=" - app-arch/zip - app-arch/unzip - >=app-text/hunspell-1.3.2-r3 - 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-1.0.0d - >=dev-libs/redland-1.0.14[ssl] - media-libs/freetype:2 - >=media-libs/fontconfig-2.8.0 - >=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 - 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 - ) - jemalloc? ( dev-libs/jemalloc ) - 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 ) - pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) - webdav? ( net-libs/neon ) -" - -RDEPEND="${COMMON_DEPEND} - !app-office/libreoffice-bin - !app-office/libreoffice-bin-debug - !app-office/openoffice-bin - !app-office/openoffice - media-fonts/libertine-ttf - media-fonts/liberation-fonts - media-fonts/urw-fonts - java? ( >=virtual/jre-1.6 ) -" - -PDEPEND=" - =app-office/libreoffice-l10n-$(get_version_component_range 1-2)* -" - -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}/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}-kde48.patch" - "${FILESDIR}/${PN}-3.5.1-kde-4.8.1-namespace.patch" -) - -REQUIRED_USE=" - gnome? ( gtk ) - nsplugin? ( gtk ) - eds? ( gnome ) -" - -# Needs lots and lots of work and compiling -RESTRICT="test" - -S="${WORKDIR}/${PN}-bootstrap-${PV}" - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - CHECKREQS_MEMORY="1G" - use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G" - check-reqs_pkg_pretend - - if [[ $(gcc-major-version) -lt 4 ]]; then - eerror "Compilation with gcc older than 4.0 is not supported" - die "Too old gcc found." - fi - fi -} - -pkg_setup() { - java-pkg-opt-2_pkg_setup - kde4-base_pkg_setup - - python_set_active_version 2 - python_pkg_setup - - 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 -} - -src_unpack() { - local mod dest tmplfile tmplname mypv - - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - 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 -} - -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*" - - # patchset - if [[ -n ${PATCHSET} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - - 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 - --without-system-vigra - " - - # 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-ldap \ - --disable-online-update \ - --disable-pch \ - --disable-rpath \ - --disable-static-gtk \ - --disable-strip-solver \ - --disable-zenity \ - --with-alloc=$(use jemalloc && echo "jemalloc" || echo "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 \ - --without-sun-templates \ - $(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 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 mysql system-mysql-cppconn) \ - $(use_with nsplugin system-mozilla libxul) \ - ${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 - newbashcomp "${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 - 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 -} diff --git a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild index 27859a03b9f8..687291f2785c 100644 --- a/app-office/libreoffice/libreoffice-3.5.2.2.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.2.2.ebuild @@ -1,6 +1,6 @@ # 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.5.2.2.ebuild,v 1.13 2012/04/22 14:17:11 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.2.2.ebuild,v 1.14 2012/04/26 11:53:14 scarabeus Exp $ EAPI=4 @@ -75,7 +75,7 @@ jemalloc kde mysql nlpsolver +nsplugin odk opengl pdfimport postgres svg test +vba +webdav +xmlsec" LICENSE="LGPL-3" SLOT="0" -[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux" +[[ ${PV} == *9999* ]] || KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" NSS_DEPEND=" >=dev-libs/nspr-4.8.8 |