forked from ports/contrib
libreoffice: 6.3.3.1 -> 6.3.3.2
This commit is contained in:
parent
e8470cb75e
commit
29d0df0e07
GPG Key ID:
42F8B4E30B673606
@ -372,6 +372,7 @@ lrwxrwxrwx root/root usr/lib/libreoffice/program/bootstraprc -> ../../../etc/lib
|
||||
-rwxr-xr-x root/root usr/lib/libreoffice/program/libpcrlo.so
|
||||
-rwxr-xr-x root/root usr/lib/libreoffice/program/libpdffilterlo.so
|
||||
-rwxr-xr-x root/root usr/lib/libreoffice/program/libpdfimportlo.so
|
||||
-rwxr-xr-x root/root usr/lib/libreoffice/program/libpdfiumlo.so
|
||||
-rwxr-xr-x root/root usr/lib/libreoffice/program/libpricinglo.so
|
||||
-rwxr-xr-x root/root usr/lib/libreoffice/program/libprotocolhandlerlo.so
|
||||
-rwxr-xr-x root/root usr/lib/libreoffice/program/libproxyfaclo.so
|
||||
@ -904,6 +905,7 @@ drwxr-xr-x root/root usr/lib/libreoffice/share/config/
|
||||
-rw-r--r-- root/root usr/lib/libreoffice/share/config/images_elementary.zip
|
||||
-rw-r--r-- root/root usr/lib/libreoffice/share/config/images_elementary_svg.zip
|
||||
-rw-r--r-- root/root usr/lib/libreoffice/share/config/images_karasa_jaga.zip
|
||||
-rw-r--r-- root/root usr/lib/libreoffice/share/config/images_karasa_jaga_svg.zip
|
||||
-rw-r--r-- root/root usr/lib/libreoffice/share/config/images_sifr.zip
|
||||
-rw-r--r-- root/root usr/lib/libreoffice/share/config/images_sifr_dark.zip
|
||||
-rw-r--r-- root/root usr/lib/libreoffice/share/config/images_sifr_svg.zip
|
||||
|
||||
@ -1,10 +1,12 @@
|
||||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF39yngUWVCPwFk0nkLyvGQeeDfLNxfSLRXEXLUsXoYQm+u7We/5+w+ZyDrSO9y80zNKL38dckQzGViyGTs21J8go=
|
||||
SHA256 (Pkgfile) = 4be258548a690340f2672b00f8a50790de7effe09352be9fc465c278fd4e6075
|
||||
SHA256 (.footprint) = 2e6bbd97b7bef2d1d5254ce95990280f95ad03849b3ea754fbab32ad9ff4a666
|
||||
SHA256 (libreoffice-6.3.3.1.tar.xz) = 4e39753489049eb2c6a698862b7d465aa98cf53b1d6c32571368d97bc144277a
|
||||
SHA256 (libreoffice-dictionaries-6.3.3.1.tar.xz) = 381f536eb83f5810b775bd047af74943b2ebaeb6d61f5746c6d1b20aa1a8ce5d
|
||||
RWSagIOpLGJF37lgPr/j3pxggvN3TUcFKg/9YKGOcQcJA+lyaK/3FaAMh+ERxItz59l+ah9jyj9D1Yf3IUDtJ3aZ55sMW+C1aAM=
|
||||
SHA256 (Pkgfile) = e888ebf08dda04896b42ebba3a114232951f2d9b94d94e97cd4b9db7d7a09eed
|
||||
SHA256 (.footprint) = 6b755d1aa8f187279150e7a99b5955120298134996bd62350b314c8c43c5678f
|
||||
SHA256 (libreoffice-6.3.3.2.tar.xz) = d40ee5b29c9a0c2f0df2681f993b04a9f64e13d785fa7b7a1e8349b84149e5cf
|
||||
SHA256 (libreoffice-dictionaries-6.3.3.2.tar.xz) = 98753ad6dadc876e98e44f157225abe702bf0de297070ee107d35d16e792429d
|
||||
SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
|
||||
SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
|
||||
SHA256 (pdfium-3794.tar.bz2) = e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4
|
||||
SHA256 (makefile.in.patch) = 50d2f5bac605f6fdbcb3234113949971b998875e832e1ae09b2498afe27f0f10
|
||||
SHA256 (fix_mdds-orcus.patch) = 2db39d1c672b542509893ff5e745c912cab634bf35942b8152de65777c9d9e94
|
||||
SHA256 (config.patch) = d02e4e454c2efaf2ab7605a7d7a101a6d8d76d95404d6eb43d5f608ad61b9a5f
|
||||
|
||||
@ -5,15 +5,17 @@
|
||||
# Optional: cups gst-plugins-base kio qt5 valgrind vlc
|
||||
|
||||
name=libreoffice
|
||||
version=6.3.3.1
|
||||
version=6.3.3.2
|
||||
release=1
|
||||
source=(
|
||||
https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-$version.tar.xz
|
||||
https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src/$name-dictionaries-$version.tar.xz
|
||||
https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
|
||||
https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
|
||||
https://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2
|
||||
makefile.in.patch
|
||||
fix_mdds-orcus.patch
|
||||
config.patch
|
||||
)
|
||||
|
||||
unpack_source() {
|
||||
@ -27,6 +29,9 @@ unpack_source() {
|
||||
0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz)
|
||||
mkdir $SRC/tarballs || true
|
||||
cp $(get_filename $file) $SRC/tarballs ;;
|
||||
pdfium-3794.tar.bz2)
|
||||
mkdir $SRC/tarballs || true
|
||||
cp $(get_filename $file) $SRC/tarballs ;;
|
||||
*)
|
||||
cp $(get_filename $file) $SRC ;;
|
||||
esac
|
||||
@ -37,6 +42,8 @@ build() {
|
||||
cd $name-$version
|
||||
patch -Np0 -i ../makefile.in.patch
|
||||
patch -Np1 -i ../fix_mdds-orcus.patch
|
||||
# fixed borked configure script that fails to test for pdfium and poppler
|
||||
patch -Np0 -i ../config.patch
|
||||
|
||||
find -L . \
|
||||
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
|
||||
@ -59,7 +66,7 @@ build() {
|
||||
--with-parallelism=${JOBS-1} \
|
||||
--prefix=/usr \
|
||||
--with-external-tar="$SRC/tarballs" \
|
||||
--enable-{build-opensymbol,dbus,firebird-sdbc=no,gtk3,introspection=yes,release-build,odk,openssl,python=system} \
|
||||
--enable-{build-opensymbol,dbus,firebird-sdbc=no,gtk3,introspection=yes,release-build,odk,openssl,pdfium,python=system} \
|
||||
--with-{lang="",package-format=archive,myspell-dicts,parallelism} \
|
||||
--with-build-version="$name-$version" \
|
||||
--with-extra-buildid="$(crux | awk '{ print $1 " " $3 }') ${build_date}" \
|
||||
@ -70,7 +77,7 @@ build() {
|
||||
--with-external-thes-dir=/usr/share/mythes \
|
||||
--without-{doxygen,fonts,gssapi,help,helppack-integration,java,system-firebird} \
|
||||
--disable-{avahi,build-unowinreg,dconf,dependency-tracking,extension-update,fetch-external} \
|
||||
--disable-{firebird-sdbc,gstreamer-0-10,gtk,postgresql-sdbc,report-builder,sdremote-bluetooth,werror}
|
||||
--disable-{firebird-sdbc,gstreamer-0-10,gtk,poppler,postgresql-sdbc,report-builder,sdremote-bluetooth,werror}
|
||||
|
||||
touch {sources.ver,src.downloaded}
|
||||
echo "lo_sources_ver=${version}" > sources.ver
|
||||
|
||||
66
libreoffice/config.patch
Normal file
66
libreoffice/config.patch
Normal file
@ -0,0 +1,66 @@
|
||||
--- configure.ac 2019-10-15 20:54:32.684816920 +0000
|
||||
+++ configure.ac.fixed 2019-10-17 01:57:03.380513944 +0000
|
||||
@@ -5928,7 +5928,7 @@
|
||||
|
||||
if test "$_os" != "WINNT"; then
|
||||
|
||||
-if test "$_os" == "iOS"; then
|
||||
+if test "$_os" = "iOS"; then
|
||||
AC_MSG_CHECKING([iOS setting sizes long, short, int, long long, double, voidp])
|
||||
ac_cv_sizeof_long=8
|
||||
ac_cv_sizeof_short=2
|
||||
@@ -10759,7 +10759,7 @@
|
||||
# Pdfium?
|
||||
AC_MSG_CHECKING([whether to build PDFium])
|
||||
ENABLE_PDFIUM=
|
||||
-if test \( -z "$enable_pdfium" -a "$ENABLE_PDFIMPORT" == "TRUE" \) -o "$enable_pdfium" = yes; then
|
||||
+if test \( -z "$enable_pdfium" -a "$ENABLE_PDFIMPORT" = "TRUE" \) -o "$enable_pdfium" = yes; then
|
||||
AC_MSG_RESULT([yes])
|
||||
ENABLE_PDFIUM=TRUE
|
||||
AC_DEFINE(HAVE_FEATURE_PDFIUM)
|
||||
@@ -10774,7 +10774,7 @@
|
||||
dnl ===================================================================
|
||||
ENABLE_POPPLER=
|
||||
AC_MSG_CHECKING([whether to build Poppler])
|
||||
-if test \( -z "$enable_poppler" -a "$ENABLE_PDFIMPORT" == "TRUE" \) -o "$enable_poppler" = yes; then
|
||||
+if test \( -z "$enable_poppler" -a "$ENABLE_PDFIMPORT" = "TRUE" \) -o "$enable_poppler" = yes; then
|
||||
AC_MSG_RESULT([yes])
|
||||
ENABLE_POPPLER=TRUE
|
||||
AC_DEFINE(HAVE_FEATURE_POPPLER)
|
||||
@@ -10783,15 +10783,15 @@
|
||||
fi
|
||||
AC_SUBST(ENABLE_POPPLER)
|
||||
|
||||
-if test "$ENABLE_PDFIMPORT" == "TRUE" -a "$ENABLE_POPPLER" != "TRUE" -a "$ENABLE_PDFIUM" != "TRUE"; then
|
||||
+if test "$ENABLE_PDFIMPORT" = "TRUE" -a "$ENABLE_POPPLER" != "TRUE" -a "$ENABLE_PDFIUM" != "TRUE"; then
|
||||
AC_MSG_ERROR([Cannot import PDF without either Pdfium or Poppler; please enable either of them.])
|
||||
fi
|
||||
|
||||
-if test "$ENABLE_PDFIMPORT" != "TRUE" -a \( "$ENABLE_POPPLER" == "TRUE" -o "$ENABLE_PDFIUM" == "TRUE" \); then
|
||||
+if test "$ENABLE_PDFIMPORT" != "TRUE" -a \( "$ENABLE_POPPLER" = "TRUE" -o "$ENABLE_PDFIUM" = "TRUE" \); then
|
||||
AC_MSG_ERROR([Cannot enable Pdfium or Poppler when PDF importing is disabled; please enable PDF import first.])
|
||||
fi
|
||||
|
||||
-if test "$ENABLE_PDFIMPORT" == "TRUE" -a "$ENABLE_POPPLER" == "TRUE"; then
|
||||
+if test "$ENABLE_PDFIMPORT" = "TRUE" -a "$ENABLE_POPPLER" = "TRUE"; then
|
||||
dnl ===================================================================
|
||||
dnl Check for system poppler
|
||||
dnl ===================================================================
|
||||
@@ -11238,7 +11238,7 @@
|
||||
qt5_test_library="libQt5Widgets.so"
|
||||
|
||||
dnl Check for qmake5
|
||||
- AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin:$PATH] )
|
||||
+ AC_PATH_PROGS( QMAKE5, [qmake-qt5 qmake], no, [$QT5DIR/bin:$PATH])
|
||||
if test "$QMAKE5" = "no"; then
|
||||
AC_MSG_ERROR([Qmake not found. Please specify the root of your Qt5 installation by exporting QT5DIR before running "configure".])
|
||||
else
|
||||
@@ -11298,7 +11298,7 @@
|
||||
|
||||
dnl Check for Meta Object Compiler
|
||||
|
||||
- AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH] )
|
||||
+ AC_PATH_PROGS( MOC5, [moc-qt5 moc], no, [`dirname $qt5_libdir`/bin:$QT5DIR/bin:$PATH])
|
||||
if test "$MOC5" = "no"; then
|
||||
AC_MSG_ERROR([Qt Meta Object Compiler not found. Please specify
|
||||
the root of your Qt installation by exporting QT5DIR before running "configure".])
|
||||
Loading…
x
Reference in New Issue
Block a user