summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorssfdust2024-01-15 19:28:59 +0800
committerssfdust2024-01-15 19:28:59 +0800
commitbc1abf2a23f19b74c1cb66a9af0f86a7821ff623 (patch)
tree7f089a7e9ba0a103f95518188fe904859ca77b8e
parent2a72b23140f8819f4c1e7a72c49fda066d3189cf (diff)
downloadaur-bc1abf2a23f19b74c1cb66a9af0f86a7821ff623.tar.gz
Personal fix for cairo-dock crash
-rw-r--r--.SRCINFO5
-rw-r--r--01-cairo-dock-dock-facility.patch13
-rw-r--r--PKGBUILD13
3 files changed, 27 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d2939a623375..d3fd7fc7b51e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cairo-dock-core-wayland-git
pkgdesc = Light eye-candy fully themable animated dock with wayland support
- pkgver = 3.4.99.alpha1.20231227.85830c2c
+ pkgver = 3.4.99.alpha1.20240114.cf35d658
pkgrel = 1
url = https://github.com/dkondor/cairo-dock-core
arch = i686
@@ -21,7 +21,10 @@ pkgbase = cairo-dock-core-wayland-git
provides = cairo-dock
conflicts = cairo-dock-core-wayland
conflicts = cairo-dock
+ options = debug
source = cairo-dock-core-wayland-git::git+https://github.com/dkondor/cairo-dock-core.git#branch=wayland_new
+ source = 01-cairo-dock-dock-facility.patch
sha256sums = SKIP
+ sha256sums = 9685d038d97e0b5edf882ef675504b6088b4495859c79bb80967dfbb743394ab
pkgname = cairo-dock-core-wayland-git
diff --git a/01-cairo-dock-dock-facility.patch b/01-cairo-dock-dock-facility.patch
new file mode 100644
index 000000000000..d8d61935ad8e
--- /dev/null
+++ b/01-cairo-dock-dock-facility.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gldit/cairo-dock-dock-facility.c b/src/gldit/cairo-dock-dock-facility.c
+index 3bd896be..7d3fd6ed 100644
+--- a/src/gldit/cairo-dock-dock-facility.c
++++ b/src/gldit/cairo-dock-dock-facility.c
+@@ -737,7 +737,7 @@ Icon * cairo_dock_calculate_wave_with_position_linear (GList *pIconList, int x_a
+ }
+
+ ic = pointed_ic;
+- while (ic != pIconList)
++ while (ic->prev && ic != pIconList)
+ {
+ icon = ic->data;
+
diff --git a/PKGBUILD b/PKGBUILD
index 6e39eedfc23c..d2badfa1b2b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
# Contributor: ssfdust <ssfdust@gmail.com>
pkgname=cairo-dock-core-wayland-git
-pkgver=3.4.99.alpha1.20231227.85830c2c
+pkgver=3.4.99.alpha1.20240114.cf35d658
pkgrel=1
pkgdesc='Light eye-candy fully themable animated dock with wayland support'
arch=('i686' 'x86_64')
@@ -18,8 +18,9 @@ optdepends=(
)
provides=("${pkgname%-git}" "cairo-dock")
conflicts=("${pkgname%-git}" "cairo-dock")
-source=("${pkgname}::git+https://github.com/dkondor/cairo-dock-core.git#branch=wayland_new")
-sha256sums=('SKIP')
+options=(debug)
+source=("${pkgname}::git+https://github.com/dkondor/cairo-dock-core.git#branch=wayland_new" "01-cairo-dock-dock-facility.patch")
+sha256sums=('SKIP' '9685d038d97e0b5edf882ef675504b6088b4495859c79bb80967dfbb743394ab')
_builddir="build"
@@ -30,6 +31,12 @@ pkgver () {
}
prepare() {
+ cd "${srcdir}/${pkgname}"
+ for patch in "${srcdir}"/*.patch; do
+ msg2 "Applying $(basename "$patch")"
+ patch -Np1 -i "$patch"
+ done
+
if [[ -d "${srcdir}/${pkgname}/${_builddir}" ]];
then
rm -rf "${srcdir}/${pkgname}/${_builddir}"