diff options
26 files changed, 263 insertions, 286 deletions
diff --git a/system/mailx/APKBUILD b/system/mailx/APKBUILD index b2e4af92e..4e9f0f221 100644 --- a/system/mailx/APKBUILD +++ b/system/mailx/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mailx pkgver=12.4 -pkgrel=0 +pkgrel=1 pkgdesc="Send and receive Internet mail" url="http://heirloom.sourceforge.net/mailx.html" arch="all" @@ -18,12 +18,12 @@ source="https://downloads.sourceforge.net/heirloom/$pkgname-$pkgver.tar.bz2 build() { cd "$builddir" - make PREFIX="/usr" SYSCONFDIR="/etc" STRIP=":" + make PREFIX="/usr" SYSCONFDIR="/etc" STRIP=":" SENDMAIL="/usr/sbin/sendmail" MAILSPOOL="/var/spool/mail" } package() { cd "$builddir" - make DESTDIR="$pkgdir" PREFIX="/usr" SYSCONFDIR="/etc" STRIP=":" UCBINSTALL="`command -v install`" install + make DESTDIR="$pkgdir" PREFIX="/usr" SYSCONFDIR="/etc" STRIP=":" UCBINSTALL="`command -v install`" SENDMAIL="/usr/sbin/sendmail" MAILSPOOL="/var/spool/mail" install install -m 755 "$srcdir"/Mail "$pkgdir"/usr/bin/Mail } diff --git a/system/shimmy/APKBUILD b/system/shimmy/APKBUILD index e3fda9d85..ae675b53b 100644 --- a/system/shimmy/APKBUILD +++ b/system/shimmy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=shimmy -pkgver=0.5 +pkgver=0.6 pkgrel=0 pkgdesc="Utilities for stricter POSIX conformance" url="https://code.foxkit.us/adelie/shimmy" @@ -23,4 +23,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a958d6297d23e784d7ecf22a53e4add890560ad13f81dc43f9dfffb697a5f4cd4d7de02d2a7e3cab7005374a674e7a5958349adddad1508b96bda94f45ef8158 shimmy-0.5.tar.xz" +sha512sums="d7c63d0f072cb32800d392ce214cbb9761194c16674a82ea2431fd9a85c4275e0111f166250ac12fd38e205ec9f64c69ea962b5b4a0e140ecef7418b1d2d993e shimmy-0.6.tar.xz" diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD index e36e44a62..17e5d241e 100644 --- a/user/breeze/APKBUILD +++ b/user/breeze/APKBUILD @@ -11,7 +11,7 @@ depends="" depends_dev="extra-cmake-modules" makedepends="$depends_dev cmake extra-cmake-modules python3 kcmutils-dev kconfigwidgets-dev kcoreaddons-dev kdecoration-dev kguiaddons-dev - ki18n-dev kpackage-dev kwayland-dev kwindowsystem-dev" + ki18n-dev kpackage-dev frameworkintegration-dev kwindowsystem-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/plasma/$pkgver/breeze-$pkgver.tar.xz" diff --git a/user/glm/APKBUILD b/user/glm/APKBUILD index 177ab1ec9..e841b0947 100644 --- a/user/glm/APKBUILD +++ b/user/glm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=glm -pkgver=0.9.9.1 +pkgver=0.9.9.3 pkgrel=0 pkgdesc="C++ header-only mathematics library for graphics programming" url="https://glm.g-truc.net/" @@ -14,7 +14,6 @@ builddir="$srcdir/$pkgname" replaces="glm-dev" build() { - cd "$builddir" mkdir build cd build @@ -27,14 +26,14 @@ build() { } check() { - cd "$builddir"/build + cd build make test } package() { - cd "$builddir"/build + cd build make install DESTDIR="$pkgdir" } -sha512sums="7e45cdede3648d5a6bfc5dd3be3514b11184f04024388207db558d7a888653e4a8714282ab898be73f9aad63630991a3eb4c1e77c271dd1ddbfb6698c71d07a3 glm-0.9.9.1.zip +sha512sums="eb7589345eb627d9fda84771bd2cf3eb0e4e9e48bf6bb7490bd8844b66558717de5dc96cde9d66e81f7ba4e54090f18dbe1bbccb2452ed0ed8c17cdf7b6e4aa2 glm-0.9.9.3.zip 954495cc875b9e70f1957f54cdaa44738268a5a1104036edcdfd74736f8a3385725f29032a533f2a5acbdbfa19d2fe4bc80ef9fdb49d3e8bdc5dc00db86c813a be.patch" diff --git a/user/libcdr/APKBUILD b/user/libcdr/APKBUILD index cdddfc1a4..d39d55e93 100644 --- a/user/libcdr/APKBUILD +++ b/user/libcdr/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libcdr -pkgver=0.1.4 -pkgrel=3 +pkgver=0.1.5 +pkgrel=0 pkgdesc="Import filter and tools for Corel DRAW files" url="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" arch="all" @@ -33,12 +33,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -47,4 +45,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="769b0319b5a904ce9f727b7076f82cd915ecd8c9e5e2456416e3e6739c6403bbd4108787ab124d36efb1b47d5c9e37c48b0e12d096eb440ae8f9979ec06048a6 libcdr-0.1.4.tar.xz" +sha512sums="e985389b0cbad65dbfa9f59d7f9dba55f1684f63e852f9acca9abb863cdaab17072e761b48dca690673360d643686b5e9bc9878530f0a3a8b5b98d917f892cf0 libcdr-0.1.5.tar.xz" diff --git a/user/libcmis/APKBUILD b/user/libcmis/APKBUILD index a60e7f2b0..bfc58c4d5 100644 --- a/user/libcmis/APKBUILD +++ b/user/libcmis/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libcmis -pkgver=0.5.1 -pkgrel=2 +pkgver=0.5.2 +pkgrel=0 pkgdesc="CMIS protocol client library for C/C++" url="https://github.com/tdf/libcmis" arch="all" @@ -15,8 +15,6 @@ subpackages="$pkgname-dev cmis-client:client" source="https://github.com/tdf/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz" build() { - cd "$builddir" - # Note: manpages require docbook2x to build ./configure \ --build=$CBUILD \ @@ -32,16 +30,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install - - # Leftover docbook file - rm -r "$pkgdir"/usr/share/man } client() { @@ -49,4 +42,4 @@ client() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="da1e66a7604f90644ad6ee691a5c06df36debec20db361e166ee64c9f8ce85be48623e38367ea2799107c10041ed5f8c3a8011a80d6eaca800c29084fb4fe0f6 libcmis-0.5.1.tar.gz" +sha512sums="3dac0eed31d1dd3ac4670e501e0677196811f7875e6d1c253c8d874d6903691cbe4f1c27c8468af07bfd7f79b0d6ec4f933b28cb3bb37dcbea18bc2dd8f6e374 libcmis-0.5.2.tar.gz" diff --git a/user/libetonyek/APKBUILD b/user/libetonyek/APKBUILD index 877041047..1156482f8 100644 --- a/user/libetonyek/APKBUILD +++ b/user/libetonyek/APKBUILD @@ -1,20 +1,20 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libetonyek -pkgver=0.1.8 +pkgver=0.1.9 pkgrel=0 pkgdesc="Import filter and tools for Apple iWork documents" url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek" arch="all" license="MPL-2.0" -depends_dev="glm boost-dev librevenge-dev liblangtag-dev" -makedepends="$depends_dev zlib-dev libxml2-dev gperf doxygen mdds" +depends_dev="glm boost-dev" +makedepends="$depends_dev librevenge-dev liblangtag-dev zlib-dev + libxml2-dev gperf doxygen mdds~1.4" checkdepends="cppunit-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,17 +24,16 @@ build() { --infodir=/usr/share/info \ --localstatedir=/var \ --disable-werror \ - --disable-static + --disable-static \ + --with-mdds=1.4 make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -43,4 +42,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865 libetonyek-0.1.8.tar.xz" +sha512sums="3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e libetonyek-0.1.9.tar.xz" diff --git a/user/libixion/32bit.patch b/user/libixion/32bit.patch deleted file mode 100644 index 13d25ac4e..000000000 --- a/user/libixion/32bit.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 869492c9f3f61aaab0d1ecdda147ea9adbdb04d5 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida <kohei.yoshida@gmail.com> -Date: Tue, 28 Aug 2018 22:58:49 -0400 -Subject: [PATCH] Fix build issues on 32-bit platforms. - -The string ID's are stored in mdds's unsigned long block, but we -have changed the underlying type of string ID's from unsigned long -to uint64_t. Because of this, on 32-bit systems it caused a type -mismatch. On 64-bit systems this was fine since unsigned long was -the underlying type for uint64_t... ---- - src/libixion/model_context.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/libixion/model_context.cpp b/src/libixion/model_context.cpp -index 0bcf940..b44713f 100644 ---- a/src/libixion/model_context.cpp -+++ b/src/libixion/model_context.cpp -@@ -541,7 +541,7 @@ void model_context_impl::set_string_cell(const abs_address_t& addr, const char* - string_id_t str_id = add_string(p, n); - column_store_t& col_store = sheet.at(addr.column); - column_store_t::iterator& pos_hint = sheet.get_pos_hint(addr.column); -- pos_hint = col_store.set(pos_hint, addr.row, str_id); -+ pos_hint = col_store.set(pos_hint, addr.row, static_cast<unsigned long>(str_id)); - } - - void model_context_impl::set_string_cell(const abs_address_t& addr, string_id_t identifier) -@@ -549,7 +549,7 @@ void model_context_impl::set_string_cell(const abs_address_t& addr, string_id_t - worksheet& sheet = m_sheets.at(addr.sheet); - column_store_t& col_store = sheet.at(addr.column); - column_store_t::iterator& pos_hint = sheet.get_pos_hint(addr.column); -- pos_hint = col_store.set(pos_hint, addr.row, identifier); -+ pos_hint = col_store.set(pos_hint, addr.row, static_cast<unsigned long>(identifier)); - } - - void model_context_impl::set_formula_cell(const abs_address_t& addr, formula_tokens_t tokens) -@@ -800,7 +800,7 @@ string_id_t model_context_impl::get_string_identifier(const abs_address_t& addr) - switch (col_store.get_type(addr.row)) - { - case ixion::element_type_string: -- return col_store.get<string_id_t>(addr.row); -+ return col_store.get<unsigned long>(addr.row); - default: - ; - } -@@ -813,7 +813,7 @@ string_id_t model_context_impl::get_string_identifier_nowait(const abs_address_t - switch (col_store.get_type(addr.row)) - { - case ixion::element_type_string: -- return col_store.get<string_id_t>(addr.row); -+ return col_store.get<unsigned long>(addr.row); - case ixion::element_type_formula: - { - const formula_cell* p = col_store.get<formula_cell*>(addr.row); --- -2.18.0 - diff --git a/user/libixion/APKBUILD b/user/libixion/APKBUILD index 22de8c82a..174323bd3 100644 --- a/user/libixion/APKBUILD +++ b/user/libixion/APKBUILD @@ -1,22 +1,19 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libixion -pkgver=0.13.0 +pkgver=0.14.1 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~1.3" +depends_dev="mdds~1.4" makedepends="$depends_dev boost-dev" subpackages="$pkgname-dev" -source="http://kohei.us/files/ixion/src/$pkgname-$pkgver.tar.xz - 32bit.patch - " +source="http://kohei.us/files/ixion/src/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -29,21 +26,17 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } dev() { default_dev - cd "$builddir" mkdir -p "$subpkgdir"/usr mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="15784e947164d106e677c59ece53b3cd401d4f9433cc5331a35d3be8332ae4f20a469ca73b30b253433c86da4afde886dfb4ac23e46ed46376a7349e0276c3a0 libixion-0.13.0.tar.xz -a6d26bfc8721f8f65a1eafa527e5b29166c9e0c45de39493bcaae17896ad6e145b78e123ea01903a96b0fb4a5b7def3dc2d256c3e301a0676e07c840603570ac 32bit.patch" +sha512sums="e4ae6348833d2178c1dc76916937bcc9d7821dc6570fe13093c441ca22e0301a1ca6a4cf85d9814b83534733dba98f4c4a372791f93bc57173317657675b9ae3 libixion-0.14.1.tar.xz" diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD index f5d322a6f..c241f9e62 100644 --- a/user/libkscreen/APKBUILD +++ b/user/libkscreen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkscreen pkgver=5.12.7 -pkgrel=0 +pkgrel=1 pkgdesc="KDE Plasma screen management software" url="https://www.kde.org/" arch="all" @@ -12,7 +12,7 @@ depends="" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qtx11extras-dev kwayland-dev" -subpackages="$pkgname-dev" +subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-wayland" source="https://download.kde.org/stable/plasma/$pkgver/libkscreen-$pkgver.tar.xz" build() { @@ -41,4 +41,18 @@ package() { make DESTDIR="$pkgdir" install } +doctor() { + pkgdesc="KDE Plasma screen debugging and management tool" + mkdir -p "$subpkgdir"/usr + mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ +} + +wayland() { + pkgdesc="$pkgdesc (Wayland support)" + install_if="$pkgname=$pkgver-r$pkgrel wayland" + mkdir -p "$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen + mv "$pkgdir"/usr/lib/qt5/plugins/kf5/kscreen/KSC_KWayland.so \ + "$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen/ +} + sha512sums="fb24d0f4f79468d4246e912f4b7e814df398911cdbd475e18263e89502ecca35c9e4974b7f0af92afa8cba3081056f8f27b0f051eb287c682dd37b35568b3c5c libkscreen-5.12.7.tar.xz" diff --git a/user/libnumbertext/APKBUILD b/user/libnumbertext/APKBUILD new file mode 100644 index 000000000..38bbb096c --- /dev/null +++ b/user/libnumbertext/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Max Rees <maxcrees@me.com> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=libnumbertext +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Number to number name and money text conversion libraries" +url="https://numbertext.github.io" +arch="all" +options="!check" # No test suite for the C++ library. +license="(BSD-3-Clause OR LGPL-3.0+) AND (CC-BY-SA-3.0 OR LGPL-3.0+ OR BSD-3-Clause)" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="https://github.com/Numbertext/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" + +build() { + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-werror + make +} + +package() { + make DESTDIR="$pkgdir" install + + cd data + make DESTDIR="$pkgdir" install +} + +sha512sums="4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3 libnumbertext-1.0.5.tar.xz" diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD index a991df5eb..3f0434eae 100644 --- a/user/liborcus/APKBUILD +++ b/user/liborcus/APKBUILD @@ -1,19 +1,18 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=liborcus -pkgver=0.13.4 +pkgver=0.14.1 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~1.3 libixion-dev~0.13" +depends_dev="boost-dev mdds~1.4 libixion-dev~0.14" makedepends="$depends_dev zlib-dev" subpackages="$pkgname-dev" -source="http://kohei.us/files/orcus/src/liborcus-$pkgver.tar.xz" +source="http://kohei.us/files/orcus/src/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -26,13 +25,11 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="f00b49c41eb1898c37d8d42e59f9004f46b5f849b9d60ac9c5033232d1e5065ff3de160e79f5a88983bf64f86e283b6d1d406a24e776aa6ff7b8acec324ccd4b liborcus-0.13.4.tar.xz" +sha512sums="a32dc5a652ce99cff37273c38fb9460e13e7bfb562f40c8d0c79b65c33e340daaeeb2c796308ca700b85bfc13cc8215641563b9e9f6d44b7d61adb8e8a3c950f liborcus-0.14.1.tar.xz" diff --git a/user/libqxp/APKBUILD b/user/libqxp/APKBUILD index 6476cc5f0..89f03aa6f 100644 --- a/user/libqxp/APKBUILD +++ b/user/libqxp/APKBUILD @@ -1,21 +1,19 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Max Rees <maxcrees@me.com> pkgname=libqxp -pkgver=0.0.1 -pkgrel=1 +pkgver=0.0.2 +pkgrel=0 pkgdesc="Import filter and tools for QuarkXPress documents" url="https://wiki.documentfoundation.org/DLP/Libraries/libqxp" arch="all" license="MPL-2.0" depends="" -depends_dev="librevenge-dev" -makedepends="$depends_dev icu-dev doxygen" +makedepends="librevenge-dev icu-dev doxygen" checkdepends="cppunit-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -25,17 +23,16 @@ build() { --infodir=/usr/share/info \ --localstatedir=/var \ make - cd "$builddir/docs" + + cd docs make } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -44,4 +41,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607 libqxp-0.0.1.tar.xz" +sha512sums="409d3df82ac522b39bdd0ef4f0a781b906e246a8e6f502009c095eea90d672c482a7fc5c7f998d89952bc598c6f51357346ed6df490c25cb48e1318e27c50dab libqxp-0.0.2.tar.xz" diff --git a/user/libreoffice/APKBUILD b/user/libreoffice/APKBUILD index 9b9cab975..a9e18b5f3 100644 --- a/user/libreoffice/APKBUILD +++ b/user/libreoffice/APKBUILD @@ -11,14 +11,14 @@ # 8 GB with Hulu in Chromium in the background is enough. # # * Disk space: -# * Dependencies: 1216 MiB -# * Downloads: 372 MiB -# * Subtotal: 1588 MiB = 1.6 GiB -# * Complete src: 28682 MiB -# * Complete pkg: 7935 MiB -# * All APKs: 1934 MiB = 1.9 GiB -# * Subtotal: 38551 MiB = 37.6 GiB -# * Grand total: 40139 MiB = 39.2 GiB +# * Dependencies: 1131 MiB +# * Downloads: 398 MiB +# * Subtotal: 1529 MiB = 1.5 GiB +# * Complete src: 33970 MiB +# * Complete pkg: 9637 MiB +# * All APKs: 2362 MiB = 2.3 GiB +# * Subtotal: 45969 MiB = 44.9 GiB +# * Grand total: 47498 MiB = 46.4 GiB # # Build stats: # * Run "abuild deps fetch" first. @@ -29,8 +29,8 @@ # abuild -r 29590.16s user 1077.69s system 340% cpu 2:30:13.12 total pkgname=libreoffice -pkgver=6.0.6.2 -pkgrel=1 +pkgver=6.2.1.2 +pkgrel=0 case "$pkgver" in *.*.*.*) _ver="${pkgver%.*}";; *.*.*) _ver="$pkgver";; @@ -43,7 +43,7 @@ url="https://www.libreoffice.org/" # and $subpackages doesn't really support setting $arch to anything other than # noarch. arch="all" -options="!checkroot" +options="" license="MPL-2.0 AND Apache-2.0 AND MIT AND X11 AND (MPL-1.1 OR GPL-2.0+ OR LGPL-2.1+) AND GPL-2.0+ AND GPL-3.0 AND GPL-3.0+ AND LGPL-2.1 AND LGPL-3.0+ AND BSD-3-Clause AND SISSL AND IJG AND CC-BY-SA-3.0" depends="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw @@ -53,21 +53,20 @@ depends="$pkgname-base $pkgname-calc $pkgname-common $pkgname-draw # 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~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 + coreutils cppunit-dev cups-dev dbus-glib-dev findutils flex fontconfig-dev + fontforge-dev freetype-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 libnumbertext-dev libpng-dev + libxml2-utils libxslt-dev mdds>=1.4.1 mythes-dev neon-dev nss-dev + openldap-dev openssl-dev paxmark perl poppler-dev postgresql-dev python3-dev + py3-lxml redland-dev sane-dev sed ucpp unixodbc-dev util-linux xmlsec-dev zip 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~0.13 + libfreehand-dev libmspub-dev libmwaw-dev libodfgen-dev liborcus-dev>=0.14 libpagemaker-dev libqxp-dev libstaroffice-dev libvisio-dev libwpd-dev libwpg-dev libwps-dev libzmf-dev " @@ -93,6 +92,8 @@ source="https://download.documentfoundation.org/$pkgname/src/$_ver/$pkgname-$pkg gettext-tiny.patch disable-crc-test.patch disable-outdated-font-test.patch + disable-mariadbc.patch + disable-mysqlc.patch " ldpath="/usr/lib/$pkgname/program" @@ -236,15 +237,11 @@ done subpackages="$subpackages $pkgname-common" prepare() { - cd "$builddir" - default_prepare NOCONFIGURE=1 ./autogen.sh } build() { - cd "$builddir" - export PYTHON="python3" # Note: --with-parallelism must be specified since getconf does not # recognize _NPROCESSORS_ONLN @@ -266,7 +263,6 @@ build() { --enable-release-build \ --enable-split-app-modules \ --enable-python=system \ - --with-alloc=system \ --with-tls=nss \ --with-system-libs \ --with-system-ucpp \ @@ -291,7 +287,8 @@ build() { --disable-pdfium \ --disable-ooenv \ --without-java \ - --disable-epm + --disable-epm \ + --enable-build-opensymbol # adding '-isystem /usr/include' make things break with gcc6 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823145 @@ -301,12 +298,10 @@ build() { } check() { - cd "$builddir" - make -k unitcheck + make -k -j1 unitcheck } package() { - cd "$builddir" make DESTDIR="$pkgdir" distro-pack-install } @@ -415,6 +410,10 @@ common() { mkdir -p "$subpkgdir/usr/share/appdata" mv "$pkgdir"/usr/share/appdata/*.xml "$subpkgdir/usr/share/appdata" + mkdir -p "$subpkgdir"/usr/lib/libreoffice/share + mv "$pkgdir"/usr/lib/libreoffice/share/libreofficekit \ + "$subpkgdir"/usr/lib/libreoffice/share/libreofficekit + # At this point there should only be empty directories left in # the "libreoffice" metapackage if [ -n "$(find "$pkgdir" -type f)" ]; then @@ -473,13 +472,15 @@ writer() { _split writer } -sha512sums="8cf7bd4d8f81ee09f8a21c4ccb12f788c67cf1cba71e08b9b720f9e8b4ec2dfcc25452ef05b6b60529463241c2b23a70eb6a79a8f15b95e890a2ea9cbb458517 libreoffice-6.0.6.2.tar.xz -7b84e2ec964b02e5d2fe17f7879080571fce02d090cde0e09de07af5419c8b7879e88a53fd1231d1195e3d29a2919c33a7d85f11c469cd87670ad67921cf8b9b libreoffice-dictionaries-6.0.6.2.tar.xz -fcc2ffeefde50abb80e539f7395efec6e022462b8b8938c2077df6fb3be217808cc2b96eb51539d5bf04fe0680807cb9af5f46f838bac6e6a5c88f90f88c5f2c libreoffice-translations-6.0.6.2.tar.xz -89caab57774f85f3e58523c0debb57247a0f10959634bf296aaacc4928bcce6ea8ed9f167b267e2e0eeb52b69714eeb094fedfa3e810cf409dfbc7c5e49b7c13 libreoffice-help-6.0.6.2.tar.xz -10a1ee056ebce41b2f6d3863b220f8529f70b7fd159ff2d36967ad96d9653166737db4ba865c10769c37afad553f59fb9629437c0d8a1afbbff963fc36dbbf1a linux-musl.patch -4aa595588226ac2060ae78f4f857db1b148735429a47389f75313df61cabf0819ad2add15c09cae5c5ebbce64852589ca89932c72281ba662ab53dddec4e1336 fix-execinfo.patch -ae36500897db9d758e95da1791ef2577d59b0e0865baba316b4a1f1f48ce9fd5e52fc3f14fa45aeeab73c5b93f57e89f9a42c996bdb3c85eb3beb2634543d85e fix-includes.patch -c50272ec2cf0471e629bf817d23e5c51ff59e94961fab1ee107f43352409353a37f2988c1ff75f423c4c5aedb1e38b432849619700e25124a33c99a589d7a80b gettext-tiny.patch -4ce3bacada3ab99dc09c6d29529bfc5e70eb287bcb61bc6e9a4ba4334cf77624121191d240f2a8f31b63e7510886904ce7842425752252e174478e0034988055 disable-crc-test.patch -887680966f8e8754d551ca7e4acc3bcae57c4fb835c49240fde05f65eb4282b8ad03deda3944b50e73b0da97ca8b28e7b1f1861907e6dbd012f5646e6d55efb4 disable-outdated-font-test.patch" +sha512sums="0d18e5f470b3e8a70d1679c7acdc91887cbbbb2032e1eb452308d257a6bc02d42e93fec66709c84838f7565e42217ac1d2b121e3356f7c754fc7ee33b7c6f0ef libreoffice-6.2.1.2.tar.xz +e9acd76b783a7a0b3344f267a8105ede52b2da92d6c1ae2b54237ffc30d4f87a8e126bb597ab3c4d993bb1e89f1b5d16921ea3d83419c1b5b69cb83aae007bd3 libreoffice-dictionaries-6.2.1.2.tar.xz +4dafc81179fbb8a0b10c774ec072d0abdcdfebbcd5eb8341802bd7d515bd0ea5fb117729ae66b5666da5927a567b54a23c870bcd16ba64478016a4ab84f7f3a5 libreoffice-translations-6.2.1.2.tar.xz +c8bd2765b46162203d0b0acc06dc76108bd0093020981e1030d26d5a8771fb9494337c16cc99c10b7de7a906e713dd27555b0af8754d142387c3a968fa663a2f libreoffice-help-6.2.1.2.tar.xz +600e4eb772b1e24e06b906682fc4d4114d62ede3adcde3639482edafef56e970ac09925fcd910dccee8a14f5ca049ac3de3f279ebcc2be3a611e3883f3a7efb8 linux-musl.patch +ed18d6bc6e03369e17b50e6b969ac0804984c1416fdfe7120251d11c59a791bb0fc8956f848ee8697fce3c074f2943b03d4441aa531ff9504be2f497a8e7e412 fix-execinfo.patch +a1d704c78e3decb83eb45b0f180e7b352d58b4005a7e43dd8fddcb4829c932da4f0dd3d4dfeaa2313c1520273e9e1c64979a0ecbe5d72737926c54d5658bd2ff fix-includes.patch +bac06a1f0f6ef3e5860ec340470583b2a7ff079efa9efee9119ae1ac320b97ecbfdb7eba63975d4f7a4e2476d3b01a9508a53a84b49df0a8febe12e17b685529 gettext-tiny.patch +6a039ba592a23b8db1dd5c8d5dffbc9562270de691d2eb1e1c420f8632532c0fce14a0f3844dc2e6f6b6b04655c40230bd69fd81d1ae6f0bd16f0e88ce0a2783 disable-crc-test.patch +4ffc389a3c545d37d152bb52390c3abd06a32eb9fee03110c07e8b57f9b9d1be68fdc5092ad0be76f6540367a1f1d2e9e32d519021d8205847594edb811da428 disable-outdated-font-test.patch +c1925fe5833410c6a4b47a1723e67ce3898fc01ebded766023855cd93f290a6788638a86a8595e112ab788628c0ea7642c41d7ff987ba9117c2e079a99a3b29f disable-mariadbc.patch +01ef207d0b3ab1ded5edadd2d05cefe65d7c2dc4285abee12d7fbb61c92b2a3e37d5cfe5bb8f5ea9a40fd2918396ec25b473a916012e04732ebbe79ee6768a21 disable-mysqlc.patch" diff --git a/user/libreoffice/disable-crc-test.patch b/user/libreoffice/disable-crc-test.patch index 35e6ce678..d2b9ab551 100644 --- a/user/libreoffice/disable-crc-test.patch +++ b/user/libreoffice/disable-crc-test.patch @@ -1,38 +1,38 @@ ---- libreoffice-6.0.6.2/vcl/qa/cppunit/svm/svmtest.cxx -+++ libreoffice-6.0.6.2/vcl/qa/cppunit/svm/svmtest.cxx -@@ -759,14 +759,13 @@ void SvmTest::checkBitmaps(const GDIMeta +--- libreoffice-6.2.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2018-09-10 16:08:33.000000000 -0400 ++++ libreoffice-6.2.1.2/vcl/qa/cppunit/svm/svmtest.cxx 2018-09-18 15:25:41.030304773 -0400 +@@ -760,14 +760,13 @@ void SvmTest::checkBitmaps(const GDIMeta xmlDocPtr pDoc = dumpMeta(rMetaFile); #ifdef LINUX -- assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "7932585a"}}); +- assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}}); + assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"},}); assertXPathAttrs(pDoc, "/metafile/bmpscale[1]", { -- {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", "08bfca1f"} +- {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", "281fc589"} + {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, }); assertXPathAttrs(pDoc, "/metafile/bmpscalepart[1]", { {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"}, {"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"}, -- {"crc", "abd45514"} +- {"crc", "5e01ddcc"} }); #else assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}}); -@@ -815,16 +814,16 @@ void SvmTest::checkBitmapExs(const GDIMe +@@ -816,16 +815,16 @@ void SvmTest::checkBitmapExs(const GDIMe #ifdef LINUX assertXPathAttrs(pDoc, "/metafile/bmpex[1]", { -- {"x", "1"}, {"y", "2"}, {"crc", "7932585a"}, {"transparenttype", "bitmap"} +- {"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}, {"transparenttype", "bitmap"} + {"x", "1"}, {"y", "2"}, {"transparenttype", "bitmap"} }); assertXPathAttrs(pDoc, "/metafile/bmpexscale[1]", { {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, -- {"crc", "08bfca1f"}, {"transparenttype", "bitmap"} +- {"crc", "281fc589"}, {"transparenttype", "bitmap"} + {"transparenttype", "bitmap"} }); assertXPathAttrs(pDoc, "/metafile/bmpexscalepart[1]", { {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"}, {"srcx", "2"}, {"srcy", "1"}, {"srcwidth", "4"}, {"srcheight", "3"}, -- {"crc", "abd45514"}, {"transparenttype", "bitmap"} +- {"crc", "5e01ddcc"}, {"transparenttype", "bitmap"} + {"transparenttype", "bitmap"} }); #else diff --git a/user/libreoffice/disable-mariadbc.patch b/user/libreoffice/disable-mariadbc.patch new file mode 100644 index 000000000..ada1d1e7a --- /dev/null +++ b/user/libreoffice/disable-mariadbc.patch @@ -0,0 +1,13 @@ +We don't have MariaDB yet and there is no ./configure option for it + +--- libreoffice-6.2.1.2/configure.ac ++++ libreoffice-6.2.1.2/configure.ac +@@ -8471,7 +8471,7 @@ AC_SUBST(PYTHON_VERSION) + AC_SUBST(PYTHON_VERSION_MAJOR) + AC_SUBST(PYTHON_VERSION_MINOR) + +-ENABLE_MARIADBC=TRUE ++ENABLE_MARIADBC= + if test "$_os" = "Android" -o "$_os" = "iOS"; then + ENABLE_MARIADBC= + fi diff --git a/user/libreoffice/disable-mysqlc.patch b/user/libreoffice/disable-mysqlc.patch new file mode 100644 index 000000000..adcdd4275 --- /dev/null +++ b/user/libreoffice/disable-mysqlc.patch @@ -0,0 +1,26 @@ +From edf9184e33e58e8d0064354016ac56a2f0d9054b Mon Sep 17 00:00:00 2001 +From: Tor Lillqvist <tml@collabora.com> +Date: Tue, 05 Mar 2019 17:28:55 +0200 +Subject: [PATCH] Make mysqlc conditional on MARIADBC, too + +Change-Id: I7e8541b8918ea5011fe9669d11b51c941544f794 +Reviewed-on: https://gerrit.libreoffice.org/68764 +Tested-by: Jenkins +Reviewed-by: Tor Lillqvist <tml@collabora.com> +Reviewed-on: https://gerrit.libreoffice.org/68783 +Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> +--- + +diff --git a/Repository.mk b/Repository.mk +index 36b35b7..f4899a1 100644 +--- a/Repository.mk ++++ b/Repository.mk +@@ -404,7 +404,7 @@ + $(call gb_Helper_optional,SCRIPTING,msforms) \ + mtfrenderer \ + $(if $(ENABLE_JAVA),mysql_jdbc) \ +- $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \ ++ $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \ + numbertext \ + odbc \ + odfflatxml \ diff --git a/user/libreoffice/disable-outdated-font-test.patch b/user/libreoffice/disable-outdated-font-test.patch index 2278fb587..02470d69a 100644 --- a/user/libreoffice/disable-outdated-font-test.patch +++ b/user/libreoffice/disable-outdated-font-test.patch @@ -1,22 +1,16 @@ 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() +--- libreoffice-6.2.1.2/editeng/qa/unit/core-test.cxx 2019-02-26 10:41:25.000000000 -0500 ++++ libreoffice-6.2.1.2/editeng/qa/unit/core-test.cxx 2019-03-11 04:28:15.930763760 -0400 +@@ -198,11 +198,6 @@ void Test::testLineSpacing() + const SvxLineSpacingItem& rLSItem = pNode->GetContentAttribs().GetItem(EE_PARA_SBL); + CPPUNIT_ASSERT_EQUAL(SvxInterLineSpaceRule::Prop, rLSItem.GetInterLineSpaceRule()); + CPPUNIT_ASSERT_EQUAL(nSpace, rLSItem.GetPropLineSpace()); +- +- // Check the first line +- ParagraphInfos aInfo = aEditEngine.GetParagraphInfos(0); +- CPPUNIT_ASSERT_EQUAL(nExpMaxAscent, aInfo.nFirstLineMaxAscent); +- CPPUNIT_ASSERT_EQUAL(nExpLineHeight, aEditEngine.GetLineHeight(0)); + }; - // 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<SfxItemSet> 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<sal_uInt16>(aEditEngine.GetLineHeight(0))); - } - - void Test::testConstruction() + // Test first case - 60% diff --git a/user/libreoffice/fix-execinfo.patch b/user/libreoffice/fix-execinfo.patch index 4c3b35917..cb82b7d84 100644 --- a/user/libreoffice/fix-execinfo.patch +++ b/user/libreoffice/fix-execinfo.patch @@ -1,7 +1,5 @@ -diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h -index 5fafc1c..408c12c 100644 ---- a/sal/osl/unx/backtrace.h -+++ b/sal/osl/unx/backtrace.h +--- libreoffice-6.2.1.2/sal/osl/unx/backtrace.h ++++ libreoffice-6.2.1.2/sal/osl/unx/backtrace.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H @@ -11,10 +9,8 @@ index 5fafc1c..408c12c 100644 #include <execinfo.h> -diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx -index f4c9a9c..da6d9cf 100644 ---- a/sal/osl/unx/signal.cxx -+++ b/sal/osl/unx/signal.cxx +--- libreoffice-6.2.1.2/sal/osl/unx/signal.cxx ++++ libreoffice-6.2.1.2/sal/osl/unx/signal.cxx @@ -35,7 +35,7 @@ #endif /* MACOSX */ @@ -24,11 +20,9 @@ index f4c9a9c..da6d9cf 100644 #include <execinfo.h> #include <link.h> #define INCLUDE_BACKTRACE -diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c -index 1d9a58b..fd648e4 100644 ---- a/sal/osl/unx/backtrace.c -+++ b/sal/osl/unx/backtrace.c -@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) +--- libreoffice-6.2.1.2/sal/osl/unx/backtrace.c ++++ libreoffice-6.2.1.2/sal/osl/unx/backtrace.c +@@ -279,7 +279,7 @@ void backtrace_symbols_fd( void **buffer } } diff --git a/user/libreoffice/fix-includes.patch b/user/libreoffice/fix-includes.patch index 4a837a94b..a4adcd352 100644 --- a/user/libreoffice/fix-includes.patch +++ b/user/libreoffice/fix-includes.patch @@ -1,7 +1,5 @@ -diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx -index f177d86..99bb408 100644 ---- a/sd/source/ui/remotecontrol/BluetoothServer.cxx -+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx +--- libreoffice-6.2.1.2/sd/source/ui/remotecontrol/BluetoothServer.cxx ++++ libreoffice-6.2.1.2/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -21,7 +21,7 @@ #include <dbus/dbus.h> #include <errno.h> @@ -11,26 +9,3 @@ index f177d86..99bb408 100644 #include <sys/socket.h> #include <bluetooth/bluetooth.h> #include <bluetooth/rfcomm.h> -diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx -index 932e928..b65ced7 100644 ---- a/vcl/inc/headless/svpinst.hxx -+++ b/vcl/inc/headless/svpinst.hxx -@@ -30,7 +30,7 @@ - - #include <list> - --#include <time.h> -+#include <sys/time.h> - - #define VIRTUAL_DESKTOP_WIDTH 1024 - #define VIRTUAL_DESKTOP_HEIGHT 768 ---- a/avmedia/source/vlc/wrapper/Types.hxx 2017-01-12 01:54:33.000000000 +0100 -+++ b/avmedia/source/vlc/wrapper/Types.hxx 2017-01-27 20:03:39.243895504 +0100 -@@ -15,6 +15,7 @@ - #if defined(_WIN32) - typedef __int64 libvlc_time_t; - #else -+# include <stdint.h> - typedef int64_t libvlc_time_t; - #endif - diff --git a/user/libreoffice/gettext-tiny.patch b/user/libreoffice/gettext-tiny.patch index 990241c3b..a63f45553 100644 --- a/user/libreoffice/gettext-tiny.patch +++ b/user/libreoffice/gettext-tiny.patch @@ -1,7 +1,7 @@ gettext-tiny does not currently ship msguniq, so let's cheat around it ---- libreoffice-6.0.6.2/solenv/gbuild/AllLangMoTarget.mk -+++ libreoffice-6.0.6.2/solenv/gbuild/AllLangMoTarget.mk +--- libreoffice-6.2.1.2/solenv/gbuild/AllLangMoTarget.mk ++++ libreoffice-6.2.1.2/solenv/gbuild/AllLangMoTarget.mk @@ -40,10 +40,10 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && \ @@ -15,9 +15,9 @@ gettext-tiny does not currently ship msguniq, so let's cheat around it fi) #$(info $(call gb_MoTarget_get_target,$(1))) ---- libreoffice-6.0.6.2/configure.ac -+++ libreoffice-6.0.6.2/configure.ac -@@ -11749,18 +11749,6 @@ +--- libreoffice-6.2.1.2/configure.ac ++++ libreoffice-6.2.1.2/configure.ac +@@ -12106,18 +12106,6 @@ else fi fi fi diff --git a/user/libreoffice/linux-musl.patch b/user/libreoffice/linux-musl.patch index 5fbf6b31c..3bd6ccdde 100644 --- a/user/libreoffice/linux-musl.patch +++ b/user/libreoffice/linux-musl.patch @@ -1,6 +1,15 @@ ---- libreoffice-5.3.0.3/configure.ac.orig 2017-01-26 22:22:46.000000000 +0000 -+++ libreoffice-5.3.0.3/configure.ac 2017-02-08 13:14:16.777547599 +0000 -@@ -652,7 +652,7 @@ +--- libreoffice-6.2.1.2/configure.ac ++++ libreoffice-6.2.1.2/configure.ac +@@ -462,7 +462,7 @@ if test -n "$with_android_ndk"; then + # (A 64-bit ld.gold grows to much over 10 gigabytes of virtual space when linking such a .so if + # all objects have been built with debug information.) + case $build_os in +- linux-gnu*) ++ linux-gnu*|linux-musl*) + ndk_build_os=linux + ;; + darwin*) +@@ -592,7 +592,7 @@ solaris*) fi ;; @@ -9,7 +18,7 @@ test_gtk=yes build_gstreamer_1_0=yes build_gstreamer_0_10=yes -@@ -4170,7 +4170,7 @@ +@@ -4149,7 +4149,7 @@ kfreebsd*) esac ;; @@ -18,7 +27,7 @@ COM=GCC USING_X11=TRUE OS=LINUX -@@ -7197,7 +7197,7 @@ +@@ -7277,7 +7277,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAIN test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; @@ -27,9 +36,9 @@ 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" -@@ -9748,21 +9748,6 @@ - fi - AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) +@@ -9854,21 +9854,6 @@ AC_SUBST(SYSTEM_LIBNUMBERTEXT_DATA) + AC_SUBST(ENABLE_LIBNUMBERTEXT) + AC_SUBST(LIBNUMBERTEXT_CFLAGS) -dnl *************************************** -dnl testing libc version for Linux... @@ -47,9 +56,9 @@ -fi - dnl ========================================= - dnl Check for the Windows SDK. + dnl Check for uuidgen dnl ========================================= -@@ -12775,7 +12760,7 @@ +@@ -12828,7 +12813,7 @@ else case "$host_os" in diff --git a/user/libsodium/APKBUILD b/user/libsodium/APKBUILD new file mode 100644 index 000000000..a63992976 --- /dev/null +++ b/user/libsodium/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Laurent Bercot <ska-adelie@skarnet.org> +# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> +pkgname=libsodium +pkgver=1.0.17 +pkgrel=0 +pkgdesc="Networking and Cryptography library: sodium fork" +url="https://libsodium.org/" +arch="all" +license="ISC" +subpackages="$pkgname-dev" +source="https://download.libsodium.org/libsodium/releases/$pkgname-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --prefix=/usr \ + --enable-retpoline \ + --with-pthreads \ + --with-gnu-ld + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make install "DESTDIR=$pkgdir" +} + +sha512sums="7cc9e4f11e656008ce9dff735acea95acbcb91ae4936de4d26f7798093766a77c373e9bd4a7b45b60ef8a11de6c55bc8dcac13bebf8c23c671d0536430501da1 libsodium-1.0.17.tar.gz" diff --git a/user/mdds/APKBUILD b/user/mdds/APKBUILD index c4a28fe12..3fe25f000 100644 --- a/user/mdds/APKBUILD +++ b/user/mdds/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: Max Rees <maxcrees@me.com> pkgname=mdds -pkgver=1.3.1 -pkgrel=1 +pkgver=1.4.3 +pkgrel=0 pkgdesc="Multi-dimensional data index algorithms" url="https://gitlab.com/mdds/mdds" arch="noarch" @@ -15,7 +15,6 @@ source="http://kohei.us/files/$pkgname/src/$pkgname-$pkgver.tar.bz2" replaces="$pkgname-dev" build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,15 +27,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install install -d 755 "$pkgdir"/usr/lib mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/ } -sha512sums="c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8 mdds-1.3.1.tar.bz2" +sha512sums="fd54a93fde89bff74a5ccf84ce5e2e002114297b165ded56a1bae92b28d70864775add140e165c7750f7dbe8ca1bfe83179cd9a835e53312c2e893c9e1f4434c mdds-1.4.3.tar.bz2" diff --git a/user/nacl/APKBUILD b/user/nacl/APKBUILD deleted file mode 100644 index 63abcb0a2..000000000 --- a/user/nacl/APKBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> -# Maintainer: Laurent Bercot <ska-adelie@skarnet.org> -pkgname=nacl -pkgver=20110221 -pkgrel=0 -pkgdesc="Networking and Cryptography library" -url="https://nacl.cr.yp.to/" -arch="all" -options="!check" # No test suite. -license="Public-Domain" -subpackages="$pkgname-dev" -source="https://hyperelliptic.org/$pkgname/$pkgname-$pkgver.tar.bz2" -_bins="curvecpclient curvecpmakekey curvecpmessage curvecpprintkey curvecpserver nacl-sha256 nacl-sha512" - -build() { - cd "$builddir" - echo "$CC $CFLAGS" > okcompilers/c - echo "g++ $CXXFLAGS" > okcompilers/cpp - ./do done # 'done' is only there to work around buggy syntax highlighting >.> -} - -package() { - mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/include/$pkgname" "$pkgdir/usr/lib/$pkgname" - _shorthostname=`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'` - cd "$builddir/build/$_shorthostname" - _okabi=`bin/okabi | head -n 1` - for i in $_bins ; do cp "bin/$i" "$pkgdir/usr/bin/" ; done - cp include/cpuid.h include/"$_okabi"/*.h "$pkgdir/usr/include/$pkgname/" - ln -s . "$pkgdir/usr/include/$pkgname/$_okabi" - cp lib/"$_okabi"/*.o lib/"$_okabi"/*.a "$pkgdir/usr/lib/$pkgname" -} - -sha512sums="4c031ceffe6a28dc74b46ac003d485531f78de467c802df73c8b22ca53644dabb7d2e3080b7bdd6583f0d07ad76b6d95bc0ffdce319ca2f80ee041e6fe618656 nacl-20110221.tar.bz2" diff --git a/user/wayland/APKBUILD b/user/wayland/APKBUILD index 9e5b68f89..0c774d994 100644 --- a/user/wayland/APKBUILD +++ b/user/wayland/APKBUILD @@ -2,12 +2,12 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> # Maintainer: pkgname=wayland -pkgver=1.14.0 -pkgrel=3 +pkgver=1.16.0 +pkgrel=0 pkgdesc="A computer display server protocol" url="https://wayland.freedesktop.org" arch="all" -options="!checkroot" +options="!check" # Buggy. license="MIT" depends="$pkgname-libs-client $pkgname-libs-cursor $pkgname-libs-server" depends_dev="libffi-dev expat-dev" @@ -55,4 +55,4 @@ _libs() { mv "$pkgdir"/usr/lib/*-$name.so.* "$subpkgdir"/usr/lib } -sha512sums="bd38b2b8963d4d98d42c270e5d7dbff6323789a173b19b67a18258424fd8adee5021b282c9d7f6dad0bd25aa0160e76aecd8ed803d4eb25d911ef0a81cd713a5 wayland-1.14.0.tar.xz" +sha512sums="64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c wayland-1.16.0.tar.xz" |