Date: Tue, 10 Sep 2024 06:43:35 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 40e6649ef49d - main - games/exult: Update to 1.10.0 Message-ID: <202409100643.48A6hZll043329@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=40e6649ef49dc7ba61998bdb0dbac9868692cb2b commit 40e6649ef49dc7ba61998bdb0dbac9868692cb2b Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2024-09-09 19:53:37 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-09-10 06:43:22 +0000 games/exult: Update to 1.10.0 ChangeLog: https://github.com/exult/exult/releases/tag/v1.10 --- games/exult/Makefile | 18 +++++++----------- games/exult/distinfo | 6 +++--- games/exult/files/patch-configure.ac | 11 ----------- games/exult/files/patch-mapedit_Makefile.am | 4 ++-- games/exult/files/patch-tools_Makefile.am | 8 ++++---- games/exult/files/patch-version.cc | 11 ----------- games/exult/pkg-plist | 1 - 7 files changed, 16 insertions(+), 43 deletions(-) diff --git a/games/exult/Makefile b/games/exult/Makefile index 131a9868b4a4..4eb7b8c3fc06 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -1,6 +1,6 @@ PORTNAME= exult -DISTVERSION?= 1.8 -PORTREVISION?= 6 +DISTVERSION?= 1.10.0 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= games @@ -14,6 +14,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libogg.so:audio/libogg \ libpng16.so:graphics/png \ libvorbis.so:audio/libvorbis +BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive USES= autoreconf compiler:c++17-lang gmake libtool localbase \ pkgconfig sdl xorg @@ -32,6 +33,7 @@ PLIST?= ${.CURDIR}/pkg-plist .if !defined(MASTERDIR) MASTER_SITES= http://prdownloads.sourceforge.net/exult/ +NO_WRKSUBDIR= yes .else USE_GITHUB= yes .endif @@ -66,7 +68,9 @@ GIMP_USE= GNOME=gtk20,pango GIMP_CONFIGURE_ENABLE= gimp-plugin -STUDIO_LIB_DEPENDS?= libharfbuzz.so:print/harfbuzz +STUDIO_LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libharfbuzz.so:print/harfbuzz \ + libicuuc.so:devel/icu STUDIO_USES= gnome STUDIO_USE= GNOME=gtk30 STUDIO_CONFIGURE_ENABLE= exult-studio exult-studio-support @@ -77,12 +81,4 @@ post-install-DOCS-on: ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.include <bsd.port.options.mk> - -# Silence cast warnings from GTK callbacks in clang >=16 -# https://github.com/exult/exult/issues/416 -.if !defined(PKGNAMESUFFIX) && ( ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))) -CFLAGS+= -Wno-cast-function-type-strict -.endif - .include <bsd.port.mk> diff --git a/games/exult/distinfo b/games/exult/distinfo index 20ad1041b9a7..8c09667f02dd 100644 --- a/games/exult/distinfo +++ b/games/exult/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659184424 -SHA256 (exult-1.8.tar.gz) = dae6b7b08925d3db1dda3aca612bdc08d934ca04de817a008f305320e667faf9 -SIZE (exult-1.8.tar.gz) = 19104130 +TIMESTAMP = 1725906914 +SHA256 (exult-1.10.0.tar.gz) = 3c8b2b66142f783b2e49e157957c7ec463595645ae8fdee8996f9baeb7b3693c +SIZE (exult-1.10.0.tar.gz) = 18205771 diff --git a/games/exult/files/patch-configure.ac b/games/exult/files/patch-configure.ac deleted file mode 100644 index bda440166ff1..000000000000 --- a/games/exult/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2022-09-03 11:46:03 UTC -+++ configure.ac -@@ -79,7 +79,7 @@ case "$host_os" in - ;; - freebsd* ) - WINDOWING_SYSTEM="-DXWIN" -- AC_DEFINE(NETBSD, 1, [Using NetBSD]) -+ AC_DEFINE(FREEBSD, 1, [Using FreeBSD]) - AC_MSG_RESULT([X11 (FreeBSD)]) - CXXFLAGS="$CXXFLAGS -I/usr/local/include" - ;; diff --git a/games/exult/files/patch-mapedit_Makefile.am b/games/exult/files/patch-mapedit_Makefile.am index 119c02a9df74..a05690e7520e 100644 --- a/games/exult/files/patch-mapedit_Makefile.am +++ b/games/exult/files/patch-mapedit_Makefile.am @@ -1,6 +1,6 @@ ---- mapedit/Makefile.am.orig 2022-04-12 16:34:45 UTC +--- mapedit/Makefile.am.orig 2024-05-30 10:27:11 UTC +++ mapedit/Makefile.am -@@ -101,8 +101,8 @@ install-exec-local: +@@ -103,8 +103,8 @@ install-exec-local: if GIMP_PLUGIN install-exec-local: diff --git a/games/exult/files/patch-tools_Makefile.am b/games/exult/files/patch-tools_Makefile.am index 2416cc2caa8b..5c4f64ac46d2 100644 --- a/games/exult/files/patch-tools_Makefile.am +++ b/games/exult/files/patch-tools_Makefile.am @@ -1,12 +1,12 @@ ---- tools/Makefile.am.orig 2022-04-12 16:34:45 UTC +--- tools/Makefile.am.orig 2024-05-30 10:27:11 UTC +++ tools/Makefile.am -@@ -56,11 +56,11 @@ if BUILD_GTHUMB +@@ -68,11 +68,11 @@ if BUILD_GTHUMB ## Does not work: #thumbnailerdir=$(datadir)/thumbnailers ## Needs to be in /usr/share/thumbnailers -thumbnailerdir=/usr/share/thumbnailers +thumbnailerdir=$(datadir)/thumbnailers - thumbnailer_in_files=gnome_u7shapes.thumbnailer.in + thumbnailer_in_files=$(top_srcdir)/tools/gnome_u7shapes.thumbnailer.in thumbnailer_DATA=$(thumbnailer_in_files:.thumbnailer.in=.thumbnailer) gnome_shp_thumbnailer_DATA=x-shapefile.xml -gnome_shp_thumbnailerdir=$(DESTDIR)$(datadir)/mime/packages @@ -14,7 +14,7 @@ # Rule to make the service file with bindir expanded $(thumbnailer_DATA): $(thumbnailer_in_files) -@@ -105,10 +105,10 @@ install-data-hook: +@@ -117,10 +117,10 @@ install-data-hook: if BUILD_GTHUMB install-data-hook: diff --git a/games/exult/files/patch-version.cc b/games/exult/files/patch-version.cc deleted file mode 100644 index c48ff501c171..000000000000 --- a/games/exult/files/patch-version.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- version.cc.orig 2022-09-03 11:51:13 UTC -+++ version.cc -@@ -210,6 +210,8 @@ void getVersionInfo(std::ostream &out) { - - out << " Version " << info.dwMajorVersion << "." << info.dwMinorVersion << " Build " << LOWORD(info.dwBuildNumber & 0xFFFF); - } -+#elif (defined(FREEBSD)) -+ out << "FreeBSD"; - #elif (defined(MACOSX)) - out << "Mac OS X"; - #elif (defined(__IPHONEOS__)) diff --git a/games/exult/pkg-plist b/games/exult/pkg-plist index 3880274d620c..747732d349cc 100644 --- a/games/exult/pkg-plist +++ b/games/exult/pkg-plist @@ -63,7 +63,6 @@ share/applications/exult.desktop %%DATADIR%%/exult_bg.flx %%DATADIR%%/exult_si.flx %%STUDIO%%%%DATADIR%%/exult_studio.glade -%%DATADIR%%/exultmsg.txt %%DATADIR%%/midisfx.flx %%DATADIR%%/u7bgintrinsics.data %%DATADIR%%/u7misc.data
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409100643.48A6hZll043329>