Publish srcux candidate 0000000835-20261022-202325

4 files changed, 8 insertions, 91 deletions

diff --git a/gui-apps/wayfire-dock/Manifest b/gui-apps/wayfire-dock/Manifest
index 981e949d69ec..9aa2581f9714 100644
--- a/gui-apps/wayfire-dock/Manifest
+++ b/gui-apps/wayfire-dock/Manifest
@@ -1,2 +1,2 @@
 DIST wayfire-dock-0.1.0.tar.gz 109326 BLAKE2B e53cea6d04b2e146318972dc48ecc68ddc225b82de83a0f5a50ed68d0c31c8dd92cee728717751e7eb2d21d0cec5d039cd86f7d6f1145fe7a03712b9c5031e02 SHA512 84390d9c5064b16abb7626985688260061dcd28a761bd6d67181603d6498114dba9e040d4261c4f369ecd35bf1553893d9e62222df97d3d661053a81f21c11af
-DIST wayfire-dock-0.1.1.tar.gz 116329 BLAKE2B e8917b9f456d2d8bdf28e5323821420d31f8d35ff78487babb94ffeae4b5aeaa7bcf051b0dccbe5d175924480dfb455e930406739c28beb0add74f434028a897 SHA512 051cf04f14248a50f222a9fc06ef65cea5557b5de5ca7983f734a9c9c2581ba2a9b8469409db51588da1bca65e5eb5122a11909769d7dfd774dd2945a9146763
+DIST wayfire-dock-0.1.1-r2.tar.gz 118876 BLAKE2B 6422a20706eba87add26bd048c06c709931f5496ca7f1262f29c61aabe3394646a0b5efc061b9904fde613c992c5d0934354a72ee1070ffe4d39f300360cdd59 SHA512 9a2bd44f0effce2748ab9b3a607e63f0107903a3bf72c06172f84d634d6a6b89f75a16fc05ff80d1fdd69d7b04baf55ecd0f599c38c8dcb9047e67d9c8e1bf01
diff --git a/gui-apps/wayfire-dock/files/wayfire-dock-0.1.1-hidden-position.patch b/gui-apps/wayfire-dock/files/wayfire-dock-0.1.1-hidden-position.patch
deleted file mode 100644
index add4cf313a4d..000000000000
--- a/gui-apps/wayfire-dock/files/wayfire-dock-0.1.1-hidden-position.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/private/src/util/wf-autohide-window.cpp
-+++ b/private/src/util/wf-autohide-window.cpp
-@@ -284,7 +284,10 @@
-     /* Set new anchor */
-     GtkLayerShellEdge edge = get_anchor_edge(position);
-     gtk_layer_set_anchor(this->gobj(), edge, true);
--    gtk_layer_set_margin(this->gobj(), edge, edge_margin);
-+    // A layout refresh must retain the current slide position. In particular,
-+    // never publish the visible margin while a member dock is hidden.
-+    gtk_layer_set_margin(this->gobj(), edge,
-+        edge_margin + (independent_edge ? double(autohide_animation) : 0));
- 
-     // margins on both sides of the window
-     if (mirror_margin && auto_exclusive_zone)
-@@ -337,14 +340,17 @@
-             gtk_layer_set_margin(gobj(), GTK_LAYER_SHELL_EDGE_LEFT,
-                 margins->left + std::max(0, int(std::lround(region->width)) - width) / 2);
-             gtk_layer_set_margin(gobj(), GTK_LAYER_SHELL_EDGE_RIGHT, 0);
--            if (get_surface()) wl_surface_commit(get_wl_surface());
-         } else if (margins)
-         {
-             gtk_layer_set_margin(gobj(), GTK_LAYER_SHELL_EDGE_LEFT, margins->left);
-             gtk_layer_set_margin(gobj(), GTK_LAYER_SHELL_EDGE_RIGHT, margins->right);
-         }
-         update_region_reservation();
--        if (!independent_edge) return;
-+        if (!independent_edge)
-+        {
-+            if (get_surface()) wl_surface_commit(get_wl_surface());
-+            return;
-+        }
-     }
- 
-     // need different measurements depending on position
-@@ -375,6 +381,7 @@
- 
- void WayfireAutohidingWindow::set_region_content_width(int width)
- {
-+    if (region_content_width == width) return;
-     region_content_width = width;
-     if (centered_region) update_position();
- }
diff --git a/gui-apps/wayfire-dock/wayfire-dock-0.1.1-r1.ebuild b/gui-apps/wayfire-dock/wayfire-dock-0.1.1-r1.ebuild
deleted file mode 100644
index 068bf0b4bd7a..000000000000
--- a/gui-apps/wayfire-dock/wayfire-dock-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Local SrcUX release recipe. Sources retain their upstream MIT provenance, except
-# private/src/panel/dock-material.cpp, adapted from Sendit (all rights reserved,
-# no redistribution grant), so the source and binaries stay fetch-restricted.
-EAPI=8
-inherit meson
-DESCRIPTION="SrcUX components for Wayfire: dock"
-SRC_URI="${P}.tar.gz"
-LICENSE="MIT all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="bindist fetch mirror test"
-DEPEND="	>=dev-cpp/gtkmm-4.12:4.0
-	>=gui-libs/wayfire-core-0.1.3
-	>=gui-libs/wayfire-ui-0.1.3
-	>=gui-libs/gtk4-layer-shell-1.3.0
-	dev-libs/wayland
-	>=gui-libs/wf-config-0.7.0
-	gui-wm/wayfire
-	dev-libs/glib:2
-	=dev-libs/yyjson-0.13.0*
-	>=gui-libs/wayfire-core-0.1.8
-	>=gui-libs/wayfire-ui-0.1.6
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}
-	>=gui-apps/wayfire-session-0.1.11
-"
-BDEPEND="virtual/pkgconfig dev-util/wayland-scanner dev-libs/wayland-protocols"
-src_configure() {
-    local emesonargs=( -Dtests=false )
-    meson_src_configure
-}
-pkg_nofetch() {
-    einfo "Place the qualified local ${P}.tar.gz in ${DISTDIR}."
-}
-
-PATCHES=( "${FILESDIR}/${P}-hidden-position.patch" )
diff --git a/gui-apps/wayfire-dock/wayfire-dock-0.1.1.ebuild b/gui-apps/wayfire-dock/wayfire-dock-0.1.1-r2.ebuild
index 0e7db79bbadc..684ea05e47bf 100644
--- a/gui-apps/wayfire-dock/wayfire-dock-0.1.1.ebuild
+++ b/gui-apps/wayfire-dock/wayfire-dock-0.1.1-r2.ebuild
@@ -1,17 +1,16 @@
-# Local SrcUX release recipe. Sources retain their upstream MIT provenance, except
-# private/src/panel/dock-material.cpp, adapted from Sendit (all rights reserved,
-# no redistribution grant), so the source and binaries stay fetch-restricted.
+# Local SrcUX release recipe. The dock material renderer is an independent MIT
+# implementation; the hidden-position fix is folded into the r2 source archive.
 EAPI=8
 inherit meson
 DESCRIPTION="SrcUX components for Wayfire: dock"
-SRC_URI="${P}.tar.gz"
-LICENSE="MIT all-rights-reserved"
+HOMEPAGE="https://www.srcux.com/"
+SRC_URI="https://www.srcux.com/distfiles/${P}-r2.tar.gz"
+S="${WORKDIR}/${P}-r2"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-RESTRICT="bindist fetch mirror test"
+RESTRICT="mirror test"
 DEPEND="	>=dev-cpp/gtkmm-4.12:4.0
-	>=gui-libs/wayfire-core-0.1.3
-	>=gui-libs/wayfire-ui-0.1.3
 	>=gui-libs/gtk4-layer-shell-1.3.0
 	dev-libs/wayland
 	>=gui-libs/wf-config-0.7.0
@@ -30,6 +29,3 @@ src_configure() {
     local emesonargs=( -Dtests=false )
     meson_src_configure
 }
-pkg_nofetch() {
-    einfo "Place the qualified local ${P}.tar.gz in ${DISTDIR}."
-}