diff --git a/net-misc/lagrange/lagrange-1.9.2.recipe b/net-misc/lagrange/lagrange-1.10.1.recipe similarity index 92% rename from net-misc/lagrange/lagrange-1.9.2.recipe rename to net-misc/lagrange/lagrange-1.10.1.recipe index ae33133b3..19009fdbb 100644 --- a/net-misc/lagrange/lagrange-1.9.2.recipe +++ b/net-misc/lagrange/lagrange-1.10.1.recipe @@ -4,11 +4,11 @@ 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." HOMEPAGE="https://gmi.skyjake.fi/lagrange/" -COPYRIGHT="2020-2021 Jaakko Keränen" +COPYRIGHT="2020-2022 Jaakko Keränen" LICENSE="BSD (2-clause)" REVISION="1" SOURCE_URI="https://github.com/skyjake/lagrange/releases/download/v$portVersion/lagrange-$portVersion.tar.gz" -CHECKSUM_SHA256="cdb8f38a0ffe2bdac1b60838a8d25a6e12313412503a129c100cbbe40c1399c8" +CHECKSUM_SHA256="d2b6ad891809183bbb46387dc84ef8fd480837a0e4784711f9861ef141236036" SOURCE_DIR="lagrange-$portVersion" PATCHES="lagrange-$portVersion.patchset" ADDITIONAL_FILES="lagrange.rdef.in" @@ -60,7 +60,8 @@ BUILD() cd build cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$appsDir/Lagrange + -DCMAKE_INSTALL_PREFIX=$appsDir/Lagrange \ + -DENABLE_POPUP_MENUS=NO make $jobArgs } diff --git a/net-misc/lagrange/patches/lagrange-1.10.1.patchset b/net-misc/lagrange/patches/lagrange-1.10.1.patchset new file mode 100644 index 000000000..24561f531 --- /dev/null +++ b/net-misc/lagrange/patches/lagrange-1.10.1.patchset @@ -0,0 +1,23 @@ +From fb9db2c3ad23cbece3872c51cdd21f698777a247 Mon Sep 17 00:00:00 2001 +From: Nikolay Korotkiy +Date: Sat, 22 Jan 2022 15:10:10 +0300 +Subject: Fix static_assert + +See https://github.com/skyjake/lagrange/issues/441 + +diff --git a/src/prefs.c b/src/prefs.c +index 6164ca2..c939529 100644 +--- a/src/prefs.c ++++ b/src/prefs.c +@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ + #include + #include + +-static_assert(offsetof(iPrefs, plainTextWrap) == offsetof(iPrefs, bools[plainTextWrap_PrefsBool]), ++_Static_assert(offsetof(iPrefs, plainTextWrap) == offsetof(iPrefs, bools[plainTextWrap_PrefsBool]), + "memory layout mismatch (needs struct packing?)"); + + void init_Prefs(iPrefs *d) { +-- +2.30.2 + diff --git a/net-misc/lagrange/patches/lagrange-1.9.2.patchset b/net-misc/lagrange/patches/lagrange-1.9.2.patchset deleted file mode 100644 index 5733a76c6..000000000 --- a/net-misc/lagrange/patches/lagrange-1.9.2.patchset +++ /dev/null @@ -1,23 +0,0 @@ -From bddf3a7d4c9527dd63ca5af943f636ff04e7102c Mon Sep 17 00:00:00 2001 -From: Nikolay Korotkiy -Date: Tue, 20 Apr 2021 22:59:30 +0300 -Subject: Expose main window unconditionaly. - -See https://codeberg.org/skyjake/lagrange/pulls/1 - -diff --git a/src/ui/window.c b/src/ui/window.c -index b8ed210..487710c 100644 ---- a/src/ui/window.c -+++ b/src/ui/window.c -@@ -973,6 +973,7 @@ - SDL_Event event = *ev; - if (event.type == SDL_USEREVENT && isCommand_UserEvent(ev, "window.unfreeze") && mw) { - mw->isDrawFrozen = iFalse; -+ d->isExposed = iTrue; - if (SDL_GetWindowFlags(d->win) & SDL_WINDOW_HIDDEN) { - SDL_ShowWindow(d->win); - } --- -2.30.2 - -