diff --git a/gemini-client/lagrange/Manifest b/gemini-client/lagrange/Manifest
index d8ff0d0..f5e24e4 100644
--- a/gemini-client/lagrange/Manifest
+++ b/gemini-client/lagrange/Manifest
@@ -1,2 +1,2 @@
-DIST lagrange-1.4.2.tar.gz 21616139 BLAKE2B a4fea160c292892ac938df155314564e162be60f236965604d2c2967bd057c2afd27312159f6bce86f64254d5d3c9818882c32631fdcebb9dbf36546cbb2d248 SHA512 ea0c8331011ba3d64b3e3053ec1a36016f49da188165552db90cb7f8bf2c46d4c42fd197d5d8edd4e243abb9821e7d520f1e5d12bbc6f49917f8b417329cb291
-DIST lagrange-1.5.1.tar.gz 20406988 BLAKE2B faae5c415fb8eb36a8301adff0ea330c11aab861c5e134a7b2601903877fbbb9d3369719151048740f35ea1fd7e3032a02b9e2287a7f7eef4864d05a0e643d25 SHA512 b5ee3ff9718c7bf4542a1f7b92b6efdd2360c01ebba2b380e0458762d317bf54c57e2c171b6d6b11a7b308255de7ce2f76905c17f70d7c0c971e48c95d15d991
+DIST lagrange-1.5.2.tar.gz 20409523 BLAKE2B 3f8888d7012f7886a61c938c5527639495d0dc424185133b663aec4e90e8de604863bac481a87606cfc5af80a3974503124a8ac7e5924a034053a1cbca705abd SHA512 971d54d072799cc03bc2521571c74e3da996f390198c3a7e04ff8480040aa1ae96d1407dec68ecb02225ece14c0032304ad1c605b6619b4538d9078c8180f9d6
+DIST lagrange-1.6.0.tar.gz 22693081 BLAKE2B 447e2d45736b476ea060804ca9b4f382e8e396e4dab6a826756b44742403b35619440e51f59f27ea9e4456677383b069554f7eb034f8b23177dbb0c9a060dfba SHA512 db0e958b959b4dbcb1d34e4fb7c7683750aa8216dcfa7868aa32397b4740552f96d21f6409320ff2a4353fb695e7aa91efafe12ec5db3be00872cd387641efec
diff --git a/gemini-client/lagrange/lagrange-1.4.2.ebuild b/gemini-client/lagrange/lagrange-1.4.2.ebuild
deleted file mode 100644
index 97c39b4..0000000
--- a/gemini-client/lagrange/lagrange-1.4.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake optfeature xdg-utils
-
-DESCRIPTION="Desktop GUI client for browsing Geminispace"
-HOMEPAGE="https://gmi.skyjake.fi/lagrange/
-https://git.skyjake.fi/gemini/lagrange"
-SRC_URI="https://git.skyjake.fi/gemini/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( MIT Unlicense ) Apache-2.0 BSD-2 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mp3"
-
-DEPEND="
- dev-libs/libpcre
- dev-libs/libunistring
- dev-libs/openssl
- media-libs/libsdl2
- mp3? ( media-sound/mpg123 )
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_MPG123=$(usex mp3)
- -DENABLE_IDLE_SLEEP=OFF # improves perfomance
- )
-
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/gemini-client/lagrange/lagrange-1.5.1.ebuild b/gemini-client/lagrange/lagrange-1.5.2.ebuild
similarity index 95%
rename from gemini-client/lagrange/lagrange-1.5.1.ebuild
rename to gemini-client/lagrange/lagrange-1.5.2.ebuild
index 756d137..ad1bce3 100644
--- a/gemini-client/lagrange/lagrange-1.5.1.ebuild
+++ b/gemini-client/lagrange/lagrange-1.5.2.ebuild
@@ -20,8 +20,8 @@ DEPEND="
dev-libs/libunistring
dev-libs/openssl
media-libs/libsdl2
- mp3? ( media-sound/mpg123 )
sys-libs/zlib
+ mp3? ( media-sound/mpg123 )
"
RDEPEND="${DEPEND}"
@@ -32,7 +32,6 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DENABLE_MPG123=$(usex mp3)
- -DENABLE_IDLE_SLEEP=OFF # reduce latency
# lib/the_Foundation
-DTFDN_ENABLE_WARN_ERROR=OFF
diff --git a/gemini-client/lagrange/lagrange-1.6.0.ebuild b/gemini-client/lagrange/lagrange-1.6.0.ebuild
new file mode 100644
index 0000000..815cc5c
--- /dev/null
+++ b/gemini-client/lagrange/lagrange-1.6.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="Desktop GUI client for browsing Geminispace"
+HOMEPAGE="https://gmi.skyjake.fi/lagrange/
+https://git.skyjake.fi/gemini/lagrange"
+SRC_URI="https://git.skyjake.fi/gemini/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="|| ( MIT Unlicense ) Apache-2.0 BSD-2 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse4_1 +fribidi +harfbuzz +mp3"
+
+DEPEND="
+ dev-libs/libpcre:3
+ dev-libs/libunistring
+ dev-libs/openssl
+ media-libs/libsdl2[sound(+),video(+)]
+ sys-libs/zlib
+ fribidi? ( dev-libs/fribidi )
+ harfbuzz? ( media-libs/harfbuzz[truetype(+)] )
+ mp3? ( media-sound/mpg123 )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ # do not add use flags that don't pull dependencies
+ # and only choose which files to compile (e.g. "ipc")
+ local mycmakeargs=(
+ -DENABLE_FRIBIDI=$(usex fribidi)
+ -DENABLE_HARFBUZZ=$(usex harfbuzz)
+ -DENABLE_MPG123=$(usex mp3)
+
+ # lib/the_Foundation
+ -DTFDN_ENABLE_WARN_ERROR=OFF
+ -DTFDN_ENABLE_SSE41=$(usex cpu_flags_x86_sse4_1)
+ )
+
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ ewarn "Lagrange 1.6 introduces some breaking changes:"
+ ewarn
+ ewarn "- A new TOFU trust store will be created. The old one is kept around but ignored."
+ ewarn "- App state serialization format has been updated. Downgrading to a previous release"
+ ewarn " will cause app state to be reset (e.g., tabs closed, navigation history cleared)."
+}
diff --git a/gemini-client/lagrange/metadata.xml b/gemini-client/lagrange/metadata.xml
index 1fd3e38..602caa8 100644
--- a/gemini-client/lagrange/metadata.xml
+++ b/gemini-client/lagrange/metadata.xml
@@ -9,19 +9,27 @@
cyber+gentoo@sysrq.in
Anna
-
- Lagrange is a desktop GUI client for browsing Geminispace.
- It offers modern conveniences familiar from web browsers,
- such as smooth scrolling, inline image viewing, multiple
+
+ Lagrange is a desktop GUI client for browsing Geminispace.
+ It offers modern conveniences familiar from web browsers,
+ such as smooth scrolling, inline image viewing, multiple
tabs, visual themes, Unicode fonts, bookmarks, history, and
page outlines.
Like the Gemini protocol, Lagrange has been designed with
minimalism in mind. It depends on a small number of essential
- libraries. It is written in C and uses SDL for
+ libraries. It is written in C and uses SDL for
hardware-accelerated graphics. OpenSSL is used for secure
communications.
+
jaakko.keranen@iki.fi