From 3a342dc5822cddf19594c6c4a2bc3a89fd20dc80 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Sun, 23 Sep 2018 16:33:17 -0400 Subject: Revert "user/mdds: bump to 1.4.1" and "user/mdds: bump to 1.4.0" This reverts commits 6d26ad27026efa29d6c9781ed7e8c4a6d32ba949 and fd3cd772382ccdcb2586666aa455cff8df714d02. --- user/mdds/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/mdds/APKBUILD b/user/mdds/APKBUILD index 9b930c8ae..c4a28fe12 100644 --- a/user/mdds/APKBUILD +++ b/user/mdds/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Timo Teräs # Maintainer: Max Rees pkgname=mdds -pkgver=1.4.1 -pkgrel=0 +pkgver=1.3.1 +pkgrel=1 pkgdesc="Multi-dimensional data index algorithms" url="https://gitlab.com/mdds/mdds" arch="noarch" @@ -39,4 +39,4 @@ package() { mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/ } -sha512sums="3ad7cf821cd1a0a4b632c5d11cc3bd7bd6da2b14069e142e087dd81c1dfa817a961edbde1d59021a5bd4859eb252d8c461341070406b952a5b46b00eb7444384 mdds-1.4.1.tar.bz2" +sha512sums="c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8 mdds-1.3.1.tar.bz2" -- cgit v1.2.3-70-g09d2 From 28172d0e96825331f8a8f22636f8e809b7a1d566 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Thu, 27 Sep 2018 00:27:02 -0400 Subject: Revert "user/libixion: bump to 0.14.0" This reverts commit f03437d5146681bfc586caa5f0e204afaad28bd8. --- user/libixion/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/libixion/APKBUILD b/user/libixion/APKBUILD index 17d1a88e6..22de8c82a 100644 --- a/user/libixion/APKBUILD +++ b/user/libixion/APKBUILD @@ -1,14 +1,14 @@ # Contributor: Timo Teräs # Maintainer: Max Rees pkgname=libixion -pkgver=0.14.0 +pkgver=0.13.0 pkgrel=0 pkgdesc="A general purpose formula parser & interpreter" url="https://gitlab.com/ixion/ixion" arch="all" license="MPL-2.0" depends="" -depends_dev="mdds" +depends_dev="mdds~1.3" makedepends="$depends_dev boost-dev" subpackages="$pkgname-dev" source="http://kohei.us/files/ixion/src/$pkgname-$pkgver.tar.xz @@ -45,5 +45,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="8681912fb1bebb4de1fdcb4f0589aa84a3e38cd21747c81a204a87594f67879732461f3c02b70d0bf5659af59c1af1fa17df425eba5946d22a8599bc8da9fd92 libixion-0.14.0.tar.xz +sha512sums="15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0 libixion-0.13.0.tar.xz a6d26bfc8721f8f65a1eafa527e5b29166c9e0c45de39493bcaae17896ad6e145b78e123ea01903a96b0fb4a5b7def3dc2d256c3e301a0676e07c840603570ac 32bit.patch" -- cgit v1.2.3-70-g09d2 From 4d4c95955555cc467ebc041451c5e89f99a2499a Mon Sep 17 00:00:00 2001 From: Max Rees Date: Sun, 23 Sep 2018 16:41:17 -0400 Subject: Revert "user/liborcus: bump to 0.14.0" This reverts commit 6c88236ce55afa14abe869b569b82f23bcde16b6. --- user/liborcus/APKBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD index fc7d0ba13..a991df5eb 100644 --- a/user/liborcus/APKBUILD +++ b/user/liborcus/APKBUILD @@ -1,13 +1,13 @@ # Contributor: Timo Teräs # Maintainer: Max Rees pkgname=liborcus -pkgver=0.14.0 +pkgver=0.13.4 pkgrel=0 pkgdesc="Library for processing spreadsheet documents" url="https://gitlab.com/orcus/orcus" arch="all" license="MPL-2.0 AND MIT" -depends_dev="boost-dev mdds libixion-dev" +depends_dev="boost-dev mdds~1.3 libixion-dev~0.13" makedepends="$depends_dev zlib-dev" subpackages="$pkgname-dev" source="http://kohei.us/files/orcus/src/liborcus-$pkgver.tar.xz" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0dca1508f3b235d9e52e131a54b0e7ec5473e4a5863a70aa7c703d3b16e8dff49de954af924c4235c5cdbd592528df15192545f08a878c5d469d7394825525b3 liborcus-0.14.0.tar.xz" +sha512sums="f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b liborcus-0.13.4.tar.xz" -- cgit v1.2.3-70-g09d2 From 87c304e5193d6b6616187da747cf922b6c830996 Mon Sep 17 00:00:00 2001 From: Max Rees Date: Mon, 24 Sep 2018 14:06:20 -0400 Subject: user/libreoffice: replace gtk3 with gtk2, disable outdated test --- user/libreoffice/APKBUILD | 41 ++++++++++++----------- user/libreoffice/disable-outdated-font-test.patch | 22 ++++++++++++ 2 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 user/libreoffice/disable-outdated-font-test.patch diff --git a/user/libreoffice/APKBUILD b/user/libreoffice/APKBUILD index fd36400dd..013787576 100644 --- a/user/libreoffice/APKBUILD +++ b/user/libreoffice/APKBUILD @@ -30,7 +30,7 @@ pkgname=libreoffice pkgver=6.0.6.2 -pkgrel=0 +pkgrel=1 case "$pkgver" in *.*.*.*) _ver="${pkgver%.*}";; *.*.*) _ver="$pkgver";; @@ -49,26 +49,29 @@ license="MPL-2.0 AND Apache-2.0 AND MIT AND X11 AND (MPL-1.1 OR GPL-2.0+ OR LGPL depends="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw $pkgname-impress $pkgname-math $pkgname-connector-postgres $pkgname-writer" # 1. Base dependencies -# 2. GUIs -# 3. File formats +# 2. GUIs - gen +# 3. GUIs - gtk+2.0 +# 4. File formats makedepends="apr-dev bash bison boost-dev cairo-dev clucene-dev cmd:which coreutils cppunit-dev cups-dev dbus-glib-dev findutils flex fontconfig-dev freetype-dev gettext-tiny-dev glm gperf gpgme-dev gst-plugins-base-dev gstreamer-dev harfbuzz-dev hunspell-dev hyphen-dev icu icu-dev lcms2-dev libcmis-dev libexttextcat-dev - libjpeg-turbo-dev libpng-dev libxml2-utils libxslt-dev mdds mythes-dev - neon-dev nss-dev openldap-dev openssl-dev paxmark perl poppler-dev - postgresql-dev python3-dev redland-dev sane-dev sed ucpp + libjpeg-turbo-dev libpng-dev libxml2-utils libxslt-dev mdds~1.3 + mythes-dev neon-dev nss-dev openldap-dev openssl-dev paxmark perl + poppler-dev postgresql-dev python3-dev redland-dev sane-dev sed ucpp unixodbc-dev util-linux xmlsec-dev zip - gtk+3.0-dev libepoxy-dev libice-dev libsm-dev libxext-dev - libxinerama-dev libxrandr-dev libxrender-dev + libepoxy-dev libxinerama-dev libxrandr-dev libxrender-dev libxext-dev + + gtk+2.0-dev gdk-pixbuf-dev glib-dev libabw-dev libcdr-dev libe-book-dev libepubgen-dev libetonyek-dev - libfreehand-dev libmspub-dev libmwaw-dev libodfgen-dev liborcus-dev + libfreehand-dev libmspub-dev libmwaw-dev libodfgen-dev liborcus-dev~0.13 libpagemaker-dev libqxp-dev libstaroffice-dev libvisio-dev libwpd-dev libwpg-dev libwps-dev libzmf-dev " + # -common also depends on these fonts _fonts="ttf-liberation ttf-dejavu ttf-carlito" checkdepends="$_fonts" @@ -77,7 +80,7 @@ checkdepends="$_fonts" # -doc comes first since it redirects manpages from the other subpackages # -lang-* comes before -common since it redirects miscellaneous # language-specific files from -common -subpackages="$pkgname-doc $pkgname-gtk3 $pkgname-base +subpackages="$pkgname-doc $pkgname-base $pkgname-gtk2 $pkgname-calc $pkgname-draw $pkgname-impress $pkgname-math $pkgname-connector-postgres $pkgname-writer" source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkgver.tar.xz @@ -89,6 +92,7 @@ source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkg fix-includes.patch gettext-tiny.patch disable-crc-test.patch + disable-outdated-font-test.patch " ldpath="/usr/lib/$pkgname/program" @@ -275,8 +279,8 @@ build() { --disable-firebird-sdbc \ --disable-coinmp \ --disable-lpsolve \ - --enable-gtk3 \ - --disable-gtk \ + --disable-gtk3 \ + --enable-gtk \ --disable-qt5 \ --disable-odk \ --disable-avahi \ @@ -400,7 +404,7 @@ _split_lang() { common() { pkgdesc="LibreOffice - common files" - depends="$pkgname-lang-en_us $pkgname-gtk3 $_fonts" + depends="$pkgname-lang-en_us $_fonts" _split common @@ -410,9 +414,6 @@ common() { mkdir -p "$subpkgdir/usr/share/appdata" mv "$pkgdir"/usr/share/appdata/*.xml "$subpkgdir/usr/share/appdata" - mkdir -p "$subpkgdir/usr/lib/libreoffice/share/libreofficekit" - mv "$pkgdir"/usr/lib/libreoffice/share/libreofficekit/*.png \ - "$subpkgdir/usr/lib/libreoffice/share/libreofficekit" # At this point there should only be empty directories left in # the "libreoffice" metapackage @@ -423,9 +424,10 @@ common() { fi } -gtk3() { - pkgdesc="LibreOffice - GTK+3.0 GUI" +gtk2() { + pkgdesc="LibreOffice - GTK+2.0 GUI" depends="libreoffice-common" + install_if="$pkgname-common=$pkgver-r$pkgrel gtk+2.0" _split gnome } @@ -479,4 +481,5 @@ fcc2ffeefde50abb80e539f7395efec6e022462b8b8938c2077df6fb3be217808cc2b96eb51539d5 4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336 fix-execinfo.patch ae36500897db9d758e95da1791ef2577d59b0e0865baba316b4a1f1f48ce9fd5e52fc3f14fa45aeeab73c5b93f57e89f9a42c996bdb3c85eb3beb2634543d85e fix-includes.patch c50272ec2cf0471e629bf817d23e5c51ff59e94961fab1ee107f43352409353a37f2988c1ff75f423c4c5aedb1e38b432849619700e25124a33c99a589d7a80b gettext-tiny.patch -4ce3bacada3ab99dc09c6d29529bfc5e70eb287bcb61bc6e9a4ba4334cf77624121191d240f2a8f31b63e7510886904ce7842425752252e174478e0034988055 disable-crc-test.patch" +4ce3bacada3ab99dc09c6d29529bfc5e70eb287bcb61bc6e9a4ba4334cf77624121191d240f2a8f31b63e7510886904ce7842425752252e174478e0034988055 disable-crc-test.patch +887680966f8e8754d551ca7e4acc3bcae57c4fb835c49240fde05f65eb4282b8ad03deda3944b50e73b0da97ca8b28e7b1f1861907e6dbd012f5646e6d55efb4 disable-outdated-font-test.patch" diff --git a/user/libreoffice/disable-outdated-font-test.patch b/user/libreoffice/disable-outdated-font-test.patch new file mode 100644 index 000000000..2278fb587 --- /dev/null +++ b/user/libreoffice/disable-outdated-font-test.patch @@ -0,0 +1,22 @@ +https://www.mail-archive.com/libreoffice@lists.freedesktop.org/msg217102.html + +--- libreoffice-6.0.6.2/editeng/qa/unit/core-test.cxx 2018-07-27 13:15:59.000000000 +0000 ++++ libreoffice-6.0.6.2/editeng/qa/unit/core-test.cxx 2018-09-27 03:45:48.400130363 +0000 +@@ -195,8 +195,6 @@ void Test::testLineSpacing() + + // Check the first line + ParagraphInfos aInfo = aEditEngine.GetParagraphInfos(0); +- CPPUNIT_ASSERT_EQUAL((sal_uInt16)122, aInfo.nFirstLineMaxAscent); +- CPPUNIT_ASSERT_EQUAL((sal_uInt16)153, (sal_uInt16)aEditEngine.GetLineHeight(0)); + + // Prepare second case - 150% + std::unique_ptr pSet2(new SfxItemSet(aEditEngine.GetEmptyItemSet())); +@@ -218,8 +216,6 @@ void Test::testLineSpacing() + + // Check the first line + ParagraphInfos aInfo2 = aEditEngine.GetParagraphInfos(0); +- CPPUNIT_ASSERT_EQUAL(sal_uInt16(337), aInfo2.nFirstLineMaxAscent); +- CPPUNIT_ASSERT_EQUAL(sal_uInt16(382), static_cast(aEditEngine.GetLineHeight(0))); + } + + void Test::testConstruction() -- cgit v1.2.3-70-g09d2