git: 9f77f7676975 - main - games/freeciv: update to 3.1.5 release (+)

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Fri, 16 May 2025 18:26:11 UTC
The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9f77f7676975f2d8f8c0f12ba11edf72ab5c05db

commit 9f77f7676975f2d8f8c0f12ba11edf72ab5c05db
Author:     Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2025-05-16 18:21:50 +0000
Commit:     Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2025-05-16 18:25:31 +0000

    games/freeciv: update to 3.1.5 release (+)
    
    Dependencies movement: Qt5 => Qt6; lua53 => lua54
    Declare detected hidden dependencies: zstd, libunwind
    Option QT5 renamed to QT (unversioned, only one Qt version can be used)
    
    Changelog:      https://freeciv.fandom.com/wiki/NEWS-3.1.5
---
 games/freeciv-nox11/Makefile                |   2 +-
 games/freeciv/Makefile                      |  34 +++++---
 games/freeciv/distinfo                      |   6 +-
 games/freeciv/files/patch-m4_sdl2-client.m4 |  11 ---
 games/freeciv/pkg-plist                     | 118 ++++++++++++++--------------
 5 files changed, 85 insertions(+), 86 deletions(-)

diff --git a/games/freeciv-nox11/Makefile b/games/freeciv-nox11/Makefile
index 426104bc205a..c63c92a22c3f 100644
--- a/games/freeciv-nox11/Makefile
+++ b/games/freeciv-nox11/Makefile
@@ -1,4 +1,4 @@
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-nox11
 
 MASTERDIR=	${.CURDIR}/../freeciv
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index c37119773664..f6319a2e15c9 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	freeciv
-PORTVERSION=	3.1.4
+PORTVERSION=	3.1.5
+PORTREVISION?=	0
 CATEGORIES=	games
 MASTER_SITES=	SF/freeciv/Freeciv%20${PORTVERSION:R}/${PORTVERSION} \
 		http://files.freeciv.org/stable/
@@ -14,10 +15,17 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicuuc.so:devel/icu \
-		libltdl.so:devel/libltdl
+		libltdl.so:devel/libltdl \
+		libzstd.so:archivers/zstd
+LIB_DEPENDS+=	${LIB_DEPENDS_${ARCH}}
+LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
+LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
+LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
+LIB_DEPENDS_powerpc64=	libunwind.so:devel/libunwind
+LIB_DEPENDS_powerpc64le=libunwind.so:devel/libunwind
 
 USES=		autoreconf compiler:c++11-lang cpe desktop-file-utils gmake \
-		iconv:wchar_t libtool lua:53 pkgconfig readline shebangfix ssl tar:xz
+		iconv:wchar_t libtool lua:54 pkgconfig readline shebangfix ssl tar:xz
 SHEBANG_FILES=	bootstrap/*.sh data/flags/convert* scripts/mapimg2anim \
 		scripts/setup_auth_server.sh translations/*.sh
 
@@ -39,14 +47,15 @@ LDFLAGS+=	-Wl,--as-needed ${ICONV_LIB}
 PORTDATA=	*
 
 OPTIONS_DEFINE=		DOCS IPV6  NLS
-OPTIONS_DEFAULT=	QT5 SQLITE3
+OPTIONS_DEFAULT=	QT SQLITE3
 OPTIONS_MULTI=		DB UI
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE3
-OPTIONS_MULTI_UI=	GTK3 GTK4 QT5 SDL
+OPTIONS_MULTI_UI=	GTK3 GTK4 QT SDL
 OPTIONS_SUB=		yes
 
 DB_DESC=	Database support
 UI_DESC=	GUI clients
+QT_DESC=	QT GUI clients
 
 GTK3_USES=	gnome sdl
 GTK3_USE=	GNOME=cairo,gdkpixbuf,glib20,gtk30,pango \
@@ -75,14 +84,15 @@ PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--with-postgres-prefix=${LOCALBASE}
 PGSQL_VARS=		_FREECIV_DB+=postgres
 
-QT5_USES=		qt:5 sdl
-QT5_USE=		QT=core,gui,widgets,buildtools:build \
+QT_USES=		qt:6 sdl
+QT_USE=			QT=base,tools:build \
 			SDL=mixer2
-QT5_CONFIGURE_ON=	--with-qt5=yes \
-			--with-qt5-includes=${LOCALBASE}/${QT_INCDIR_REL} \
-			--with-qt5-libs=${LOCALBASE}/${QT_LIBDIR_REL}
-QT5_CONFIGURE_ENABLE=	ruledit
-QT5_VARS=		_FREECIV_CLIENT+=qt \
+QT_CONFIGURE_ON=	--with-qt6=yes \
+			--with-qt6-includes=${LOCALBASE}/${QT_INCDIR_REL} \
+			--with-qt6-libs=${LOCALBASE}/${QT_LIBDIR_REL}
+QT_CONFIGURE_ENV=	MOCCMD=${MOC}
+QT_CONFIGURE_ENABLE=	ruledit
+QT_VARS=		_FREECIV_CLIENT+=qt \
 			_FREECIV_MP+=qt
 
 SDL_USES=	sdl
diff --git a/games/freeciv/distinfo b/games/freeciv/distinfo
index 7519d0ad323f..6cb803f16ac7 100644
--- a/games/freeciv/distinfo
+++ b/games/freeciv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742855068
-SHA256 (freeciv-3.1.4.tar.xz) = 14999bb903c4507cc287d5a8dd1b89eee623bb41b4e01e0836567fb5f13296e4
-SIZE (freeciv-3.1.4.tar.xz) = 46674900
+TIMESTAMP = 1747411889
+SHA256 (freeciv-3.1.5.tar.xz) = 0d9f687ff950a77a9fa0af66108a7f67da717fd40c3a0ca4c0a4f4a3f0214b33
+SIZE (freeciv-3.1.5.tar.xz) = 46870140
diff --git a/games/freeciv/files/patch-m4_sdl2-client.m4 b/games/freeciv/files/patch-m4_sdl2-client.m4
deleted file mode 100644
index 5f48eef0e82e..000000000000
--- a/games/freeciv/files/patch-m4_sdl2-client.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/sdl2-client.m4.orig	2019-06-15 17:19:23 UTC
-+++ m4/sdl2-client.m4
-@@ -82,7 +82,7 @@ AC_DEFUN([FC_SDL2_PROJECT],
-   ac_save_LIBS="$LIBS"
-   CPPFLAGS="$CPPFLAGS $SDL2_CFLAGS"
-   CFLAGS="$CFLAGS $SDL2_CFLAGS"
--  LIBS="$LIBS $SDL2_LIBS"
-+  LIBS="$LIBS $SDL2_LIBS -lm"
-   AC_CHECK_LIB([$1], [$2],
-                [sdl2_lib_found="yes"], [sdl2_lib_found="no"
- sdl2_h_found="no"])
diff --git a/games/freeciv/pkg-plist b/games/freeciv/pkg-plist
index e31877207f97..7357e7ad349e 100644
--- a/games/freeciv/pkg-plist
+++ b/games/freeciv/pkg-plist
@@ -5,10 +5,10 @@
 bin/freeciv-mp-cli
 %%GTK3%%bin/freeciv-mp-gtk3
 %%GTK4%%bin/freeciv-mp-gtk4
-%%QT5%%bin/freeciv-mp-qt
-%%QT5%%bin/freeciv-qt
-%%QT5%%bin/freeciv-ruledit
-%%QT5%%bin/freeciv-ruleup
+%%QT%%bin/freeciv-mp-qt
+%%QT%%bin/freeciv-qt
+%%QT%%bin/freeciv-ruledit
+%%QT%%bin/freeciv-ruleup
 %%SDL%%bin/freeciv-sdl2
 bin/freeciv-server
 %%ETCDIR%%/database.lua
@@ -23,9 +23,9 @@ lib/libfreeciv.so.0.0.0
 %%GTK3%%share/applications/org.freeciv.gtk3.mp.desktop
 %%GTK4%%share/applications/org.freeciv.gtk4.desktop
 %%GTK4%%share/applications/org.freeciv.gtk4.mp.desktop
-%%QT5%%share/applications/org.freeciv.qt.desktop
-%%QT5%%share/applications/org.freeciv.qt.mp.desktop
-%%QT5%%share/applications/org.freeciv.ruledit.desktop
+%%QT%%share/applications/org.freeciv.qt.desktop
+%%QT%%share/applications/org.freeciv.qt.mp.desktop
+%%QT%%share/applications/org.freeciv.ruledit.desktop
 %%SDL%%share/applications/org.freeciv.sdl2.desktop
 share/applications/org.freeciv.server.desktop
 %%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
@@ -68,149 +68,149 @@ share/applications/org.freeciv.server.desktop
 %%PORTDOCS%%%%DOCSDIR%%/doxygen.md
 %%CLIENT%%share/icons/hicolor/128x128/apps/freeciv-client.png
 %%CLIENT%%share/icons/hicolor/128x128/apps/freeciv-modpack.png
-%%QT5%%share/icons/hicolor/128x128/apps/freeciv-ruledit.png
+%%QT%%share/icons/hicolor/128x128/apps/freeciv-ruledit.png
 share/icons/hicolor/128x128/apps/freeciv-server.png
 %%CLIENT%%share/icons/hicolor/16x16/apps/freeciv-client.png
 %%CLIENT%%share/icons/hicolor/16x16/apps/freeciv-modpack.png
-%%QT5%%share/icons/hicolor/16x16/apps/freeciv-ruledit.png
+%%QT%%share/icons/hicolor/16x16/apps/freeciv-ruledit.png
 share/icons/hicolor/16x16/apps/freeciv-server.png
 %%CLIENT%%share/icons/hicolor/32x32/apps/freeciv-client.png
 %%CLIENT%%share/icons/hicolor/32x32/apps/freeciv-modpack.png
-%%QT5%%share/icons/hicolor/32x32/apps/freeciv-ruledit.png
+%%QT%%share/icons/hicolor/32x32/apps/freeciv-ruledit.png
 share/icons/hicolor/32x32/apps/freeciv-server.png
 %%CLIENT%%share/icons/hicolor/48x48/apps/freeciv-client.png
 %%CLIENT%%share/icons/hicolor/48x48/apps/freeciv-modpack.png
-%%QT5%%share/icons/hicolor/48x48/apps/freeciv-ruledit.png
+%%QT%%share/icons/hicolor/48x48/apps/freeciv-ruledit.png
 share/icons/hicolor/48x48/apps/freeciv-server.png
 %%CLIENT%%share/icons/hicolor/64x64/apps/freeciv-client.png
 %%CLIENT%%share/icons/hicolor/64x64/apps/freeciv-modpack.png
-%%QT5%%share/icons/hicolor/64x64/apps/freeciv-ruledit.png
+%%QT%%share/icons/hicolor/64x64/apps/freeciv-ruledit.png
 share/icons/hicolor/64x64/apps/freeciv-server.png
 %%NLS%%share/locale/ar/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/ar/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/ar/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/bg/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/bg/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/ca/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/ca/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/cs/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/cs/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/da/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/da/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/da/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/da/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/de/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/de/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/de/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/de/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/el/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/el/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/el/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/el/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/eo/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/eo/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/es/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/es/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/es/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/es/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/es_419/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/es_419/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/es_419/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/es_419/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/et/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/et/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/et/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/et/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/fa/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/fa/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/fi/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/fi/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/fr/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/fr/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/ga/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/ga/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/gd/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/gd/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/gd/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/gd/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/gl_ES/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/gl_ES/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/gl_ES/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/gl_ES/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/he/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/he/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/he/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/he/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/hu/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/hu/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/id/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/id/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/id/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/id/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/it/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/it/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/it/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/it/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/ja/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/ja/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/ko/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/ko/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/lt/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/lt/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/nb/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/nb/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/nl/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/nl/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/pl/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/pl/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/pt/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/pt/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/ro/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/ro/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/ru/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/ru/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/sk/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/sk/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/sr/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/sr/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/sv/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/sv/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/tr/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/tr/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/uk/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/uk/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/freeciv-core.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-nations.mo
-%%QT5%%%%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-ruledit.mo
+%%QT%%%%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-ruledit.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/freeciv-core.mo
 %%GTK3%%share/metainfo/org.freeciv.gtk3.metainfo.xml
 %%GTK3%%share/metainfo/org.freeciv.gtk322.metainfo.xml
 %%GTK3%%share/metainfo/org.freeciv.gtk3.mp.metainfo.xml
 %%GTK4%%share/metainfo/org.freeciv.gtk4.metainfo.xml
 %%GTK4%%share/metainfo/org.freeciv.gtk4.mp.metainfo.xml
-%%QT5%%share/metainfo/org.freeciv.qt.metainfo.xml
-%%QT5%%share/metainfo/org.freeciv.qt.mp.metainfo.xml
-%%QT5%%share/metainfo/org.freeciv.ruledit.metainfo.xml
+%%QT%%share/metainfo/org.freeciv.qt.metainfo.xml
+%%QT%%share/metainfo/org.freeciv.qt.mp.metainfo.xml
+%%QT%%share/metainfo/org.freeciv.ruledit.metainfo.xml
 %%SDL%%share/metainfo/org.freeciv.sdl2.metainfo.xml
 share/metainfo/org.freeciv.server.metainfo.xml
 share/man/man6/freeciv.6.gz
@@ -223,14 +223,14 @@ share/man/man6/freeciv-modpack.6.gz
 share/man/man6/freeciv-mp-cli.6.gz
 %%GTK3%%share/man/man6/freeciv-mp-gtk3.6.gz
 %%GTK4%%share/man/man6/freeciv-mp-gtk4.6.gz
-%%QT5%%share/man/man6/freeciv-mp-qt.6.gz
-%%QT5%%share/man/man6/freeciv-qt.6.gz
-%%QT5%%share/man/man6/freeciv-ruledit.6.gz
-%%QT5%%share/man/man6/freeciv-ruleup.6.gz
+%%QT%%share/man/man6/freeciv-mp-qt.6.gz
+%%QT%%share/man/man6/freeciv-qt.6.gz
+%%QT%%share/man/man6/freeciv-ruledit.6.gz
+%%QT%%share/man/man6/freeciv-ruleup.6.gz
 @comment share/man/man6/freeciv-sdl.6.gz
 %%SDL%%share/man/man6/freeciv-sdl2.6.gz
 share/man/man6/freeciv-server.6.gz
 @comment share/man/man6/freeciv-xaw.6.gz
 %%CLIENT%%share/pixmaps/freeciv-client.png
 %%CLIENT%%share/pixmaps/freeciv-modpack.png
-%%QT5%%share/pixmaps/freeciv-ruledit.png
+%%QT%%share/pixmaps/freeciv-ruledit.png