diff options
author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-09-30 22:44:19 +0200 |
---|---|---|
committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-12-31 01:37:05 +0100 |
commit | bbab7f59e9630416397189df70ec133bdd690e38 (patch) | |
tree | 2ebb595d5a675fda686781b56ea08f80b933cb61 /x11 | |
parent | Revert "audio/mythplugin-mythmusic: Remove expired port" (diff) |
*/*: Sunset 12.4-RELEASE/12-STABLE from ports tree
- Remove all references to defunct ARCH arm
- Remove all references to defunct ARCH sparc64
- Remove x11-drivers/xf86-video-sunffb which requires defunct sparc64
ARCH
- Remove sysutils/afbinit requires defunct sparc64 ARCH
- Remove all references to bktr driver
- Remove all references to defunct FreeBSD_12
- Remove all references to OSVERSION/OSREL corresponding to 12
- Remove conditionals in Mk/Uses/cabal.mk
- Remove sparc reference from Mk/Uses/qt-dist.mk
- Remove BROKEN_sparc64/NOT_FOR_ARCH=sparc64
- Remove BROKEN_FreeBSD_12* from:
- Remove OpenSSL patches from:
- Remove conditional flags for OSVERSION >= 1300000 to fixed flags.
Also move conditional flags for non sparc64/arm ARCH to fixed flags.
Reviewed by: brooks, jbeich, rene, salvadore
Differential Revision: https://reviews.freebsd.org/D42068
Diffstat (limited to 'x11')
-rw-r--r-- | x11/foot/Makefile | 1 | ||||
-rw-r--r-- | x11/kitty/Makefile | 5 | ||||
-rw-r--r-- | x11/kitty/files/extra-patch-kitty_data-types.h | 13 | ||||
-rw-r--r-- | x11/nvidia-driver/Makefile | 2 | ||||
-rw-r--r-- | x11/sandbar/Makefile | 2 | ||||
-rw-r--r-- | x11/squeekboard/Makefile | 1 | ||||
-rw-r--r-- | x11/wl-mirror/Makefile | 2 | ||||
-rw-r--r-- | x11/xdg-desktop-portal-hyprland/Makefile | 2 | ||||
-rw-r--r-- | x11/xdg-desktop-portal-luminous/Makefile | 2 |
9 files changed, 1 insertions, 29 deletions
diff --git a/x11/foot/Makefile b/x11/foot/Makefile index 1c492bad3410..90cbf8bcff57 100644 --- a/x11/foot/Makefile +++ b/x11/foot/Makefile @@ -27,7 +27,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} OPTIONS_DEFINE= DOCS LTO NOTIFY PGO UTF8PROC XDG OPTIONS_DEFAULT=LTO NOTIFY PGO UTF8PROC XDG OPTIONS_EXCLUDE+= ${CC:T:Mgcc*:C/.+/LTO/} # undefined reference to `xstrdup' -OPTIONS_EXCLUDE_FreeBSD_12= ${WAYLAND_DISPLAY:UPGO} # ./pgo hangs DOCS_BUILD_DEPENDS= scdoc:textproc/scdoc DOCS_MESON_ENABLED= docs diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index 245a84560e81..255af9fdd566 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -96,11 +96,6 @@ USES+= ncurses:port USES+= ncurses .endif -# fix clang static_assert on 12.x releases, https://github.com/kovidgoyal/kitty/pull/5398 -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-kitty_data-types.h -.endif - post-patch: ${REINPLACE_CMD} -i.bak -e "s:'go':'${GO_CMD}':1" ${WRKSRC}/setup.py ${REINPLACE_CMD} -i.bak -e "s:%%DATADIR%%:${DATADIR}:1" \ diff --git a/x11/kitty/files/extra-patch-kitty_data-types.h b/x11/kitty/files/extra-patch-kitty_data-types.h deleted file mode 100644 index 3926ab024c92..000000000000 --- a/x11/kitty/files/extra-patch-kitty_data-types.h +++ /dev/null @@ -1,13 +0,0 @@ ---- kitty/data-types.h.orig 2022-08-22 11:08:26 UTC -+++ kitty/data-types.h -@@ -159,6 +159,10 @@ typedef union CellAttrs { - #define NUM_UNDERLINE_STYLES (5u) - #define SGR_MASK (~(((CellAttrs){.width=WIDTH_MASK, .mark=MARK_MASK}).val)) - -+#ifndef static_assert -+#define static_assert _Static_assert -+#endif -+ - typedef struct { - color_type fg, bg, decoration_fg; - sprite_index sprite_x, sprite_y, sprite_z; diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index f494e3c88cce..cb28a6a24b46 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -189,7 +189,7 @@ post-patch: .SILENT ${WRKSRC}/src/${NVSRC}/nvidia_subr.c .endif # Pull the right header after FreeBSD src r347984 -.if ${OSVERSION} >= 1300029 && ${NVVERSION} >= 358.009 +.if ${NVVERSION} >= 358.009 ${REINPLACE_CMD} -e '/^#include/s:lock\.h:mutex.h:' \ ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c .endif diff --git a/x11/sandbar/Makefile b/x11/sandbar/Makefile index 8a6a947a8376..9aaeab7e660d 100644 --- a/x11/sandbar/Makefile +++ b/x11/sandbar/Makefile @@ -10,8 +10,6 @@ WWW= https://github.com/kolunmi/sandbar LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_12= ld: error: undefined symbol: memfd_create - BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ tllist>=1.0.1:devel/tllist \ wayland-protocols>0:graphics/wayland-protocols diff --git a/x11/squeekboard/Makefile b/x11/squeekboard/Makefile index 08d3993849ea..3c55ff22934c 100644 --- a/x11/squeekboard/Makefile +++ b/x11/squeekboard/Makefile @@ -14,7 +14,6 @@ WWW= https://gitlab.gnome.org/World/Phosh/squeekboard LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_12_powerpc64= fails to compile: rs.e2mg9us3-cgu.14:(.text.imservice_handle_commit_state+0x228): undefined reference to 'eekboard_context_service_show_keyboard' BROKEN_FreeBSD_13_powerpc64= fails to link: ld: error: undefined symbol: eekboard_context_service_get_overlay BUILD_DEPENDS= wayland-protocols>=1.12:graphics/wayland-protocols diff --git a/x11/wl-mirror/Makefile b/x11/wl-mirror/Makefile index 93fff29792b8..a43485907a55 100644 --- a/x11/wl-mirror/Makefile +++ b/x11/wl-mirror/Makefile @@ -10,8 +10,6 @@ WWW= https://github.com/Ferdi265/wl-mirror LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_12= ld: error: undefined symbol: memfd_create - BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libwayland-egl.so:graphics/wayland diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile index 76b47240825e..b4c9a1666180 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -10,8 +10,6 @@ WWW= https://github.com/hyprwm/xdg-desktop-portal-hyprland LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_12= libc++ too old - BUILD_DEPENDS= wayland-protocols>=1.31:graphics/wayland-protocols LIB_DEPENDS= libsdbus-c++.so:devel/sdbus-cpp \ libdrm.so:graphics/libdrm \ diff --git a/x11/xdg-desktop-portal-luminous/Makefile b/x11/xdg-desktop-portal-luminous/Makefile index 7f56f5240595..5c12331aea0b 100644 --- a/x11/xdg-desktop-portal-luminous/Makefile +++ b/x11/xdg-desktop-portal-luminous/Makefile @@ -11,8 +11,6 @@ WWW= https://github.com/waycrate/xdg-desktop-portal-luminous LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_12= ld: error: undefined symbol: memfd_create - LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= slurp:x11/slurp |