From 86fd9f0b4e2b379f30629b50bd83916681fccd80 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 10 May 2017 15:50:16 +0200 Subject: [PATCH 1/5] libreoffice: Strip trailing spaces --- libreoffice-5.0.2.2_0374db2-2.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libreoffice-5.0.2.2_0374db2-2.bee b/libreoffice-5.0.2.2_0374db2-2.bee index 2fd824048..66e71dc26 100755 --- a/libreoffice-5.0.2.2_0374db2-2.bee +++ b/libreoffice-5.0.2.2_0374db2-2.bee @@ -110,7 +110,7 @@ mee_install() { mkdir -p ${D}/usr/local/bin - + for p in sbase sdraw simpress soffice scalc smath swriter ; do echo ${p} cat > ${D}/usr/local/bin/${p} <<-EOF From 4ddea39582d43e7e31a77f4e8a1f8d104df54b17 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 10 May 2017 15:51:17 +0200 Subject: [PATCH 2/5] libreoffice: Convert to versionless bee file --- libreoffice-5.0.2.2_0374db2-2.bee => libreoffice.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libreoffice-5.0.2.2_0374db2-2.bee => libreoffice.be0 (99%) diff --git a/libreoffice-5.0.2.2_0374db2-2.bee b/libreoffice.be0 similarity index 99% rename from libreoffice-5.0.2.2_0374db2-2.bee rename to libreoffice.be0 index 66e71dc26..639bfe3d9 100755 --- a/libreoffice-5.0.2.2_0374db2-2.bee +++ b/libreoffice.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libreoffice-5.0.2.2_0374db2-2 + ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 18d705a685d96f3dce604b295b19958e621f29cb Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 10 May 2017 16:56:56 +0200 Subject: [PATCH 3/5] libreoffice: Copy bee file for 5.1.3.2 --- libreoffice.be0 | 144 +++++++++++++++++------------------------------- 1 file changed, 50 insertions(+), 94 deletions(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index 639bfe3d9..fd389fc65 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libreoffice-5.0.2.2_0374db2-2 +# BEE_VERSION libreoffice-5.1.3.2-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -9,13 +9,14 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="" +SRCURL[0]="https://download.documentfoundation.org/libreoffice/src/${PKGVERSION[3]}/libreoffice-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -# PATCHURL+=() +# https://bugs.documentfoundation.org/show_bug.cgi?id=100459 +PATCHURL+=("/src/mariux/download/libreoffice-5.1.3.2-fix-postgresql-configure.patch") ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not @@ -28,7 +29,7 @@ SRCURL[0]="" ## outside the source directory and need to be build inside the source ## directory. -build_in_sourcedir +# build_in_sourcedir ############################################################################### ## bee cannot detect buildtypes specified in subdirectories. @@ -38,113 +39,68 @@ build_in_sourcedir # sourcesubdir_append src + ############################################################################### ## Change the default (auto-detected) steps to ## extract, patch, configure/setup, build and install the software. ## Make sure the mee_install function does install everything to the ## image directory "${D}" -mee_extract() { - mkdir -p $S - cd $S - git clone /home/buczek/git/libreoffice-core . - git checkout -b tmp $PKGEXTRAVERSION - - cache=/dev/shm/buczek/libreoffice - if test -d $cache/tarballs; then - mkdir external/tarballs - cp $cache/tarballs/* external/tarballs/ - fi - - if test -d $cache/repros/translations; then - cp -r $cache/repros/translations . - fi - - if test -d $cache/repros/helpcontent2; then - cp -r $cache/repros/helpcontent2 . - fi - - - for f in base calc draw impress main math writer; do - if test -e $cache/icons/libreoffice5.0-$f.svg; then - cp $cache/icons/libreoffice5.0-$f.svg . - else - wget https://raw.githubusercontent.com/gnome-design-team/gnome-icons/master/apps-symbolic/Adwaita/scalable/apps/libreoffice-$f-symbolic.svg \ - -O libreoffice5.0-$f.svg - fi - done -} - -#mee_patch() { -# bee_patch "${@}" +#mee_extract() { +# bee_extract "${@}" #} -PREFIX=/usr/local/libreoffice +mee_patch() { + bee_patch "${@}" + sed -e "/gzip -f/s/echo/set -x; echo/" \ + -i bin/distro-install-desktop-integration +} mee_configure() { - - #./autogen.sh \ bee_configure \ - --enable-verbose \ - --enable-release-build \ - --with-help \ - --with-lang=de \ - --with-jdk-home=/usr/local/java \ - --with-ant-home=/package/mariux64/ant \ - --without-junit \ - --without-doxygen \ - --disable-odk \ - --disable-epm \ - --enable-python=internal + --with-lang=de \ + --with-help \ + --with-jdk-home=/usr/local/java \ + --with-ant-home=/package/mariux64/ant \ + --without-doxygen \ + --without-junit \ + --disable-dconf \ + --disable-epm \ + --disable-odk \ + --enable-release-build \ + --enable-python=internal \ + --with-system-apr \ + --with-system-cairo \ + --with-system-curl \ + --with-system-expat \ + --with-system-harfbuzz \ + --with-system-icu \ + --with-system-jpeg \ + --with-system-lcms2 \ + --with-system-libatomic_ops \ + --with-system-libpng \ + --with-system-libxml \ + --with-system-neon \ + --with-system-npapi-headers \ + --with-system-nss \ + --with-system-odbc \ + --with-system-openldap \ + --with-system-openssl \ + --with-system-poppler \ + --with-system-postgresql \ + --with-system-serf \ + --with-system-zlib } mee_build() { - #bee_build - make + # https://bugs.documentfoundation.org/show_bug.cgi?id=100453 + chmod 755 ${S}/bin/unpack-sources + bee_build } mee_install() { - - #make install INSTALLDIR=$D/usr/local/libreoffice - bee_install INSTALLDIR=/usr/local/libreoffice - - rm $D/gid_Module_* - - - mkdir -p ${D}/usr/local/bin - - for p in sbase sdraw simpress soffice scalc smath swriter ; do - echo ${p} - cat > ${D}/usr/local/bin/${p} <<-EOF - #!/bin/bash - exec /usr/local/libreoffice/program/${p} "\$@" - EOF - chmod -v 755 ${D}/usr/local/bin/${p} - done - - for p in openoffice libreoffice{,${PKGVERSION[2]}} ; do - cat > ${D}/usr/local/bin/${p} <<-EOF - #!/bin/bash - exec /usr/local/libreoffice/program/soffice "\$@" - EOF - chmod -v 755 ${D}/usr/local/bin/${p} - done - - mkdir -pv ${D}/usr/share/applications - - for i in ${D}/usr/local/libreoffice/share/xdg/* ; do - b=$(basename ${i}) - ln -sv /usr/local/libreoffice/share/xdg/${b} \ - ${D}/usr/share/applications/libreoffice-${b} - done - - mkdir -pv $D/usr/share/icons/hicolor/scalable/apps/ - for f in base calc draw impress main math writer; do - cp $S/libreoffice5.0-$f.svg $D/usr/share/icons/hicolor/scalable/apps/ - done - ln -s libreoffice5.0-main.svg $D/usr/share/icons/hicolor/scalable/apps/libreoffice5.0-startcenter.svg + start_cmd make ${BEE_MAKEFLAGS} distro-pack-install DESTDIR=${D} } - ## by default this may be 'make install DESTDIR="${D}"' ############################################################################### @@ -154,7 +110,7 @@ mee_install() { ## The name of this bee-file should follow the following naming convention: ## pkgname-pkgversion-pkgrevision.bee ## -## You may remove all comments as long as SRCURL[0]="" is set. +## You may remove all comments as long as SRCURL[0] is set. ## ## Everything in this file will be executed in a bash environment. ## From f8adbf88c3e8b83f7ddb74dd5f51bda60b793b43 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 10 May 2017 16:57:48 +0200 Subject: [PATCH 4/5] libreoffice: Update version from 5.1 to 5.3.0.3 --- libreoffice.be0 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libreoffice.be0 b/libreoffice.be0 index fd389fc65..fbab3dd20 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libreoffice-5.1.3.2-0 +# BEE_VERSION libreoffice-5.3.0.3-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -15,8 +15,7 @@ SRCURL[0]="https://download.documentfoundation.org/libreoffice/src/${PKGVERSION[ ## Add URLs/pathes to patch files to the PATCHURL array. ## The sources will be patched in the order of the array. -# https://bugs.documentfoundation.org/show_bug.cgi?id=100459 -PATCHURL+=("/src/mariux/download/libreoffice-5.1.3.2-fix-postgresql-configure.patch") +# PATCHURL+=() ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not @@ -81,7 +80,6 @@ mee_configure() { --with-system-libpng \ --with-system-libxml \ --with-system-neon \ - --with-system-npapi-headers \ --with-system-nss \ --with-system-odbc \ --with-system-openldap \ From 1576368c6a70a2d356eff69911332a88e650e890 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 11 May 2017 14:16:54 +0200 Subject: [PATCH 5/5] libreoffice: Remove stupid root check ``` [BEE] <= leaving mee_configure() .. [BEE] => entering mee_build() .. [BEE] make -j62 No. You make ME a sandwich. Makefile:58: recipe for target 'check-if-root' failed make: *** [check-if-root] Error 1 ``` --- libreoffice.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libreoffice.be0 b/libreoffice.be0 index fbab3dd20..82d12776e 100755 --- a/libreoffice.be0 +++ b/libreoffice.be0 @@ -88,6 +88,8 @@ mee_configure() { --with-system-postgresql \ --with-system-serf \ --with-system-zlib + sed -i 's/all: check-if-root build/all: build/g' ${B}/Makefile + sed -i 's/bootstrap: check-if-root compilerplugins/all: compilerplugins/g' ${B}/Makefile } mee_build() {