aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Hutchinson <portmaster@BSDforge.com>2025-09-11 15:51:13 +0000
committerYasuhiro Kimura <yasu@FreeBSD.org>2025-10-02 01:01:03 +0000
commitaf30510a9c859dd721759aa88d40530370d7d007 (patch)
treecca9de75421395c89fc1dbdaa8e74ab0faba97f8
parenta0d0dd6fde21434c3ab7db904683fcfd3125945d (diff)
x11-wm/compiz-plugins-unsupported: upgrade 0.8.8 ==> 0.8.9
Fix build on 13.5 and 14.2. PR: 289469 Reported by: pkg-fallout
-rw-r--r--x11-wm/compiz-plugins-unsupported/Makefile6
-rw-r--r--x11-wm/compiz-plugins-unsupported/distinfo6
-rw-r--r--x11-wm/compiz-plugins-unsupported/files/patch-src_atlantis_swim.c45
3 files changed, 50 insertions, 7 deletions
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 455f01b1c92e..2ea605af76bc 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -1,6 +1,5 @@
PORTNAME= compiz-plugins-unsupported
-DISTVERSION= 0.8.8
-PORTREVISION= 12
+DISTVERSION= 0.8.9
CATEGORIES= x11-wm
MASTER_SITES= https://codeberg.org/BSDforge/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
@@ -21,8 +20,7 @@ RUN_DEPENDS= ${MY_DEPENDS}
USES= gettext-tools gmake gnome libtool:keepla localbase:ldflags \
pathfix pkgconfig xorg
-# pet pkgfallout@ till I finish updating Compiz et al;
-USE_CSTD= gnu89
+
USE_GNOME= intltool libxslt
USE_XORG= ice sm x11 xcomposite xdamage xext xfixes xinerama xorgproto \
xrandr
diff --git a/x11-wm/compiz-plugins-unsupported/distinfo b/x11-wm/compiz-plugins-unsupported/distinfo
index 5b74a6b35d1c..407fcf0e196e 100644
--- a/x11-wm/compiz-plugins-unsupported/distinfo
+++ b/x11-wm/compiz-plugins-unsupported/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1751434440
-SHA256 (compiz-plugins-unsupported-0.8.8.tar.gz) = d2e756f0cb70489c2de06e3dad1fbc822f1c5cdc1ff722aa10fc8c88396f5275
-SIZE (compiz-plugins-unsupported-0.8.8.tar.gz) = 1676248
+TIMESTAMP = 1757605498
+SHA256 (compiz-plugins-unsupported-0.8.9.tar.gz) = 9acd77b15418af9f51daaf830b14d79426560a21ba4e6e2bbfb5d0a694344d68
+SIZE (compiz-plugins-unsupported-0.8.9.tar.gz) = 1676472
diff --git a/x11-wm/compiz-plugins-unsupported/files/patch-src_atlantis_swim.c b/x11-wm/compiz-plugins-unsupported/files/patch-src_atlantis_swim.c
new file mode 100644
index 000000000000..aef0647d1a30
--- /dev/null
+++ b/x11-wm/compiz-plugins-unsupported/files/patch-src_atlantis_swim.c
@@ -0,0 +1,45 @@
+--- src/atlantis/swim.c.orig 2025-09-11 05:17:13 UTC
++++ src/atlantis/swim.c
+@@ -413,8 +413,6 @@ BoidsAngle(CompScreen *s,
+ float theta = as->fish[i].theta;
+
+ float factor = 5+5*fabs(symmDistr());
+-
+- float factor = 5+5*fabsf(symmDistr());
+ float randPsi = 10*symmDistr();
+ float randTh = 10*symmDistr();
+
+@@ -477,15 +475,15 @@ BoidsAngle(CompScreen *s,
+ factor = 1; /* positive means form group, negative means stay away.
+ the amount is proportional to the relative
+ importance of the pairs of fish.*/
+- if (type < as->fish[j].type)
++ if (time < as->fish[j].type)
+ {
+ if (as->fish[j].type <= FISH2)
+ factor =-1; /* fish is coming up against different fish */
+ else
+- factor = (float) (type - as->fish[j].type) * 3;
++ factor = *(float*) (time - as->fish[j].type) * 3;
+ /* fish is coming against a shark, etc. */
+ }
+- else if (type == as->fish[j].type)
++ else if (time == as->fish[j].type)
+ {
+ if (as->fish[i].group != as->fish[j].group &&
+ !atlantisGetSchoolSimilarGroups(s))
+@@ -497,11 +495,11 @@ BoidsAngle(CompScreen *s,
+
+ if (atlantisGetSchoolSimilarGroups(s))
+ {
+- if ( (type == CHROMIS && (as->fish[j].type == CHROMIS2 ||
++ if ( (time == CHROMIS && (as->fish[j].type == CHROMIS2 ||
+ as->fish[j].type == CHROMIS3)) ||
+- (type == CHROMIS2 && (as->fish[j].type == CHROMIS ||
++ (time == CHROMIS2 && (as->fish[j].type == CHROMIS ||
+ as->fish[j].type == CHROMIS3)) ||
+- (type == CHROMIS3 && (as->fish[j].type == CHROMIS ||
++ (time == CHROMIS3 && (as->fish[j].type == CHROMIS ||
+ as->fish[j].type == CHROMIS2)))
+ factor = 1;
+ }