diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-10 16:22:04 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-04-10 16:22:04 +0000 |
| commit | 8abc2e989fbd0842a5ac2b22149d9831df5a9906 (patch) | |
| tree | 106fcda072d2fea8909b60bab869b730748e6a78 /testing | |
| parent | 49a5d8f68676730b4a02d8971171924d7c8e2146 (diff) | |
| download | aports-8abc2e989fbd0842a5ac2b22149d9831df5a9906.tar.bz2 aports-8abc2e989fbd0842a5ac2b22149d9831df5a9906.tar.xz | |
main/libreoffice: moved to main
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/libreoffice/APKBUILD | 205 | ||||
| -rw-r--r-- | testing/libreoffice/fix-execinfo.patch | 24 | ||||
| -rw-r--r-- | testing/libreoffice/fix-includes.patch | 31 | ||||
| -rw-r--r-- | testing/libreoffice/linux-musl.patch | 68 |
4 files changed, 0 insertions, 328 deletions
diff --git a/testing/libreoffice/APKBUILD b/testing/libreoffice/APKBUILD deleted file mode 100644 index b798859939..0000000000 --- a/testing/libreoffice/APKBUILD +++ /dev/null @@ -1,205 +0,0 @@ -# Contributor: Timo Teräs <timo.teras@iki.fi> -# Maintainer: -pkgname=libreoffice -pkgver=4.4.2.2 -pkgrel=0 -pkgdesc="LibreOffice - Meta package for the full office suite" -url="http://www.libreoffice.org/" -arch="all" -license="MPL2" -depends_dev="cups-dev libjpeg-turbo-dev boost-dev clucene-dev libe-book-dev icu-dev - libetonyek-dev libwpd-dev libwpg-dev libmspub-dev libmwaw-dev libpagemaker-dev - libvisio-dev libcmis-dev lcms2-dev cppunit-dev freetype-dev libabw-dev libwps-dev - libxslt-dev postgresql-dev mdds-dev glm-dev glu-dev glew-dev vigra-dev - unixodbc-dev openldap-dev openssl-dev nss-dev npapi-sdk hunspell-dev - libxrender-dev libxrandr-dev neon-dev apr-dev redland-dev libexttextcat-dev - gconf-dev bluez-dev gstreamer1-dev gst-plugins-base1-dev gtk+2.0-dev - poppler-dev cairo-dev hyphen-dev mythes-dev python3-dev harfbuzz-dev - libfreehand-dev libodfgen-dev libcdr-dev" -makedepends="$depends_dev autoconf automake tar coreutils ucpp gperf bison flex - zip perl perl-archive-zip sed" -# GNU sed is needed for in i18npool/CustomTarget_localedata.mk -install="" -subpackages="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw - $pkgname-gnome $pkgname-impress $pkgname-lang-en_us $pkgname-math - $pkgname-connector-postgres $pkgname-writer" -depends="$subpackages" -_addsrcurl="http://dev-www.libreoffice.org/src" -source="http://download.documentfoundation.org/libreoffice/src/${pkgver%.*}/libreoffice-$pkgver.tar.xz - $_addsrcurl/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - linux-musl.patch - fix-execinfo.patch - fix-includes.patch - " - -# help abuild find shared objects in rpath -ldpath="/usr/lib/libreoffice/program:/usr/lib/libreoffice/ure/lib/" - -_builddir="$srcdir"/libreoffice-$pkgver -unpack() { - if [ -z "$force" ]; then - verify || return 1 - initdcheck || return 1 - fi - mkdir -p "$srcdir" - msg "Unpacking sources..." - - local u - for u in $source; do - local s="$SRCDEST/$(filename_from_uri $u)" - case $s in - */libreoffice-*.tar.xz) - msg "Unpacking $s..." - unxz -c "$s" | tar -C "$srcdir" -x || return 1;; - esac - done -} - -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done - - # https://bugs.documentfoundation.org/show_bug.cgi?id=78174 - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64812 - # gcc 4.9.x -fvisibility-inlines-hidden is broken, force disable it for now - sed -e 's/@HAVE_GCC_VISIBILITY_BROKEN@/TRUE/g' -i config_host.mk.in - - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd "$_builddir" - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --localstatedir=/var \ - --with-vendor="Alpine Linux" \ - --disable-online-update \ - --disable-fetch-external \ - --disable-dependency-tracking \ - --disable-crashdump \ - --enable-release-build \ - --enable-split-app-modules \ - --enable-verbose \ - --enable-python=system \ - --with-alloc=system \ - --with-tls=openssl \ - --with-system-libs \ - --with-system-dicts \ - --with-system-ucpp \ - --with-external-dict-dir=/usr/share/hunspell \ - --with-external-hyph-dir=/usr/share/hyphen \ - --with-external-tar="$srcdir" \ - --without-java \ - --without-fonts \ - --without-system-sane \ - --without-myspell-dicts \ - --disable-firebird-sdbc \ - --disable-orcus \ - --disable-graphite \ - --disable-coinmp \ - --disable-lpsolve \ - --disable-gltf \ - --disable-liblangtag \ - || return 1 - make || return 1 -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir"/../all distro-pack-install || return 1 -} - -_split() { - local i - for i in $(grep -v ^%dir $_builddir/file-lists/${1}_list.txt | sort -u); do - dirname="$(dirname $i)" - [ -d "$subpkgdir/$dirname" ] || install -dm755 "$subpkgdir/$dirname" - mv "$pkgdir"/../all/"$i" "$subpkgdir"/"$i" - done -} - -base() { - pkgdesc="LibreOffice - Database frontend" - depends="libreoffice-common" - _split base -} - -calc() { - pkgdesc="LibreOffice - Spreadsheet" - depends="libreoffice-common" - _split calc -} - -common() { - pkgdesc="LibreOffice - Common files" - depends="libreoffice-lang-en_us" - _split common -} - -draw() { - pkgdesc="LibreOffice - Drawing application" - depends="libreoffice-common" - _split draw -} - -gnome() { - pkgdesc="LibreOffice - GNOME integration" - depends="libreoffice-common" - _split gnome -} - -impress() { - pkgdesc="LibreOffice - Presentation application" - depends="libreoffice-common" - _split impress -} - -en_us() { - pkgdesc="LibreOffice - English (US) language pack" - depends="" - _split lang_en_US -} - -math() { - pkgdesc="LibreOffice - Equation editor" - depends="libreoffice-common" - _split math -} - -postgres() { - pkgdesc="LibreOffice - Connector for PostgreSQL database" - depends="libreoffice-base" - _split postgresql -} - -writer() { - pkgdesc="LibreOffice - Word Processor" - depends="libreoffice-common" - _split writer -} - -md5sums="5971b3feefec99f819d8b6c6260eb845 libreoffice-4.4.2.2.tar.xz -1f24ab1d39f4a51faf22244c94a6203f 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -69bef53b6dc9d39d59d1514d02dbbcf7 linux-musl.patch -1cff63a520d1b037edddf1b4de4799dc fix-execinfo.patch -2410b3fef56a2163a0d3142330ecbcdc fix-includes.patch" -sha256sums="7d1cae6c6e03854c53d415ad7a8d445b734e5929a056330c5938c1f5073a2e36 libreoffice-4.4.2.2.tar.xz -390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -5cf5a446e5769f6a2df01c5c10702514fe9178334d1e53d3c7df843ca72c6fa2 linux-musl.patch -7171dfa651a7ee81b4e13a9fd9131428d9a65af138cac4cb428ae6c3e4bcb1f3 fix-execinfo.patch -2044d4c997472a46e95c68fa8bec19c1424e9074fad05df9f1c0d220dec00281 fix-includes.patch" -sha512sums="b13f44745cda2e149e8deb4f962e77e684e8e972c1e42483198b1e93f5ca1c067a06ee4f81dc24c5ae42a0c2d299aa3cf30bfbe9d119414f59bd7c7d4828f696 libreoffice-4.4.2.2.tar.xz -5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -5fb4d5bf5cab21a0c95a9e51a4a138b427a08677c34bc14287c3eb74926b606345d5185c76bbe8957043d79dc33d46cf4aaa5182642c7fb9136dc48ed9e7fabb linux-musl.patch -567123f990c4a47c2e4cebf99f3486150740015e647ca2b2521e606f3350fc55ceda6c7ac031302da34e8fc90747d66619334fcfda4e7b8998456fe3619ab860 fix-execinfo.patch -15defc8362fb0e53db32b75d9c4ece73e1ee8bd1cc05b4dd8f072f808e6943b385a5415513b237d3daa130dedce3c6ac6370e05ec0b4a25065ce27aadd269e92 fix-includes.patch" diff --git a/testing/libreoffice/fix-execinfo.patch b/testing/libreoffice/fix-execinfo.patch deleted file mode 100644 index 01fca6fb2e..0000000000 --- a/testing/libreoffice/fix-execinfo.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru sal.orig/osl/unx/backtrace.h sal/osl/unx/backtrace.h ---- a/sal/osl/unx/backtrace.h 2015-01-22 22:05:28.000000000 -0200 -+++ b/sal/osl/unx/backtrace.h 2015-02-02 17:06:27.765494731 -0200 -@@ -47,7 +47,7 @@ - - #endif /* defined SOLARIS || FREEBSD || NETBSD || OPENBSD */ - --#if defined (LINUX) -+#if defined (LINUX) && defined (__GLIBC__) - #include <execinfo.h> - #endif - -diff -ru sal.orig/osl/unx/signal.cxx sal/osl/unx/signal.cxx ---- a/sal/osl/unx/signal.cxx 2015-01-22 22:05:28.000000000 -0200 -+++ b/sal/osl/unx/signal.cxx 2015-02-02 17:06:53.495496086 -0200 -@@ -36,7 +36,7 @@ - - #endif /* MACOSX */ - --#ifdef LINUX -+#if defined (LINUX) && defined (__GLIBC__) - #include <execinfo.h> - #include <link.h> - #define INCLUDE_BACKTRACE diff --git a/testing/libreoffice/fix-includes.patch b/testing/libreoffice/fix-includes.patch deleted file mode 100644 index b1f1b44101..0000000000 --- a/testing/libreoffice/fix-includes.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx 2015-02-02 20:38:46.879497689 -0200 -+++ libreoffice-4.4.0.3/vcl/inc/headless/svpinst.hxx 2015-02-02 20:38:55.482831474 -0200 -@@ -32,6 +32,7 @@ - #include <list> - - #include <time.h> -+#include <sys/time.h> - - #define VIRTUAL_DESKTOP_WIDTH 1024 - #define VIRTUAL_DESKTOP_HEIGHT 768 ---- libreoffice-4.4.0.3/vcl/unx/generic/gdi/cairotextrender.cxx 2015-02-02 21:19:22.822959064 -0200 -+++ libreoffice-4.4.0.3/vcl/unx/generic/gdi/cairotextrender.cxx 2015-02-02 21:19:48.312960404 -0200 -@@ -18,6 +18,7 @@ - */ - - #include "cairotextrender.hxx" -+#include "generic/glyphcache.hxx" - - #include <basegfx/polygon/b2dpolypolygon.hxx> - #include <vcl/settings.hxx> ---- libreoffice-4.4.0.3/sd/source/ui/remotecontrol/BluetoothServer.cxx 2015-02-03 08:42:36.590056362 -0200 -+++ libreoffice-4.4.0.3/sd/source/ui/remotecontrol/BluetoothServer.cxx 2015-02-03 08:42:46.030056456 -0200 -@@ -22,7 +22,7 @@ - #include <dbus/dbus.h> - #include <errno.h> - #include <fcntl.h> -- #include <sys/unistd.h> -+ #include <unistd.h> - #include <sys/socket.h> - #include <bluetooth/bluetooth.h> - #include <bluetooth/rfcomm.h> diff --git a/testing/libreoffice/linux-musl.patch b/testing/libreoffice/linux-musl.patch deleted file mode 100644 index 5c8ab52976..0000000000 --- a/testing/libreoffice/linux-musl.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- libreoffice-4.4.0.3/configure.ac.orig 2015-01-22 22:05:28.000000000 -0200 -+++ libreoffice-4.4.0.3/configure.ac 2015-02-02 20:11:20.639411153 -0200 -@@ -569,7 +569,7 @@ - fi - ;; - --linux-gnu*|k*bsd*-gnu*) -+linux-gnu*|linux-musl*|k*bsd*-gnu*) - test_gtk=yes - build_gstreamer_1_0=yes - build_gstreamer_0_10=yes -@@ -4058,7 +4058,7 @@ - esac - ;; - --linux-gnu*) -+linux-gnu*|linux-musl*) - COM=GCC - GUIBASE=unx - OS=LINUX -@@ -6967,7 +6967,7 @@ - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" - ;; - -- linux-gnu*) -+ linux-gnu*|linux-musl*) - JAVAINC="-I$JAVA_HOME/include" - JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux" - test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" -@@ -9429,21 +9429,6 @@ - fi - AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) - --dnl *************************************** --dnl testing libc version for Linux... --dnl *************************************** --if test "$_os" = "Linux"; then -- AC_MSG_CHECKING([whether libc is >= 2.1.1]) -- exec 6>/dev/null # no output -- AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC) -- exec 6>&1 # output on again -- if test "$HAVE_LIBC"; then -- AC_MSG_RESULT([yes]) -- else -- AC_MSG_ERROR([no, upgrade libc]) -- fi --fi -- - dnl ========================================= - dnl Check for the Windows SDK. - dnl ========================================= -@@ -12741,7 +12726,7 @@ - - case "$host_os" in - -- aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*) -+ aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*) - if test "$ENABLE_JAVA" != "" -a "$JDK"!="gcj"; then - pathmunge "$JAVA_HOME/bin" "after" - fi -@@ -12789,7 +12774,6 @@ - esac - - pathmunge "$SRC_ROOT/solenv/bin" "before" -- pathmunge "." "before" - fi - - AC_SUBST(LO_PATH) |
