[packages/widelands] - up to 1.1
mrozowik
mrozowik at pld-linux.org
Sat Feb 4 22:38:07 CET 2023
commit 2be483d6184dc35d91b9108b1f35a4706a59ff4f
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Sat Feb 4 21:37:55 2023 +0000
- up to 1.1
gcc11.patch | 10 --
widelands-install.patch | 27 -----
widelands-pld.patch | 74 ++++++------
widelands.spec | 306 +++++++++++++++++++++++++-----------------------
4 files changed, 201 insertions(+), 216 deletions(-)
---
diff --git a/widelands.spec b/widelands.spec
index 4cb1598..099e2e4 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -2,26 +2,24 @@
# - check locales
# - use system fonts where possible
#
-%define buildver 21
Summary: A real-time build-up strategy game
Summary(pl.UTF-8): Gra strategiczna czasu rzeczywistego z budowaniem
Name: widelands
-Version: 1.0
-Release: 3
+Version: 1.1
+Release: 1
License: GPL v2+
Group: X11/Applications/Games
#Source0Download: https://wl.widelands.org/wiki/Download/#release
-Source0: https://launchpad.net/%{name}/1.x/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5: ac576b20273205a09bc1e6dc19550499
+Source0: https://github.com/widelands/widelands/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 04d84445a479a976c6d82a032b685822
Patch0: %{name}-pld.patch
-Patch1: %{name}-install.patch
-Patch2: gcc11.patch
URL: https://wl.widelands.org/
BuildRequires: Mesa-libGL-devel
BuildRequires: SDL2-devel >= 2
BuildRequires: SDL2_image-devel >= 2
BuildRequires: SDL2_mixer-devel >= 2
BuildRequires: SDL2_ttf-devel >= 2.0.12
+BuildRequires: asio-devel
BuildRequires: boost-devel >= 1.48
BuildRequires: cmake >= 2.8.7
BuildRequires: curl-devel
@@ -32,6 +30,7 @@ BuildRequires: graphviz
BuildRequires: libicu-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel >= 6:4.8
+BuildRequires: minizip-devel
BuildRequires: python >= 2
BuildRequires: python-modules >= 2
BuildRequires: rpmbuild(macros) >= 1.605
@@ -64,6 +63,7 @@ nastawione i rozpocząć z Tobą handel. Jednak, jeśli chcesz rządzić
Summary: A real-time build-up strategy game - data files
Summary(pl.UTF-8): Gra strategiczna czasu rzeczywistego z budowaniem - pliki danych
Group: X11/Applications/Games
+Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description data
@@ -74,19 +74,29 @@ by Settlers II.
Pliki danych do Widelands - gry strategicznej czasu rzeczywistego z
budowaniem, zainspirowanej Settlers II.
+%package debug
+Summary: Debugging tools for Widelands
+Summary(pl.UTF-8): Narzędzia debugowania dla Widelands
+%description debug
+Additional debugging data for Widelands. This package is not needed
+for normal operation.
+
+%description debug -l pl.UTF-8
+Dodatkowe dane debugowania dla Widelands. Ten pakiet nie jest
+potrzebny do normalnej pracy.
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
install -d build
cd build
%cmake .. \
- -DWL_INSTALL_BASEDIR=%{_prefix} \
- -DWL_INSTALL_BINDIR=%{_bindir} \
- -DWL_INSTALL_DATADIR=%{_datadir}/games/%{name}
+ -DWL_INSTALL_PREFIX=%{_prefix} \
+ -DWL_INSTALL_BINDIR=bin \
+ -DWL_INSTALL_DATADIR=%{_datadir}/%{name} \
+ -DWL_INSTALL_LOCALEDIR=%{_datadir}/%{name}/locale
%{__make}
@@ -114,9 +124,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc ChangeLog CREDITS
%attr(755,root,root) %{_bindir}/widelands
-%attr(755,root,root) %{_bindir}/wl_create_spritesheet
-%attr(755,root,root) %{_bindir}/wl_map_info
-%attr(755,root,root) %{_bindir}/wl_map_object_info
%{_datadir}/metainfo/org.widelands.Widelands.appdata.xml
%{_desktopdir}/org.widelands.Widelands.desktop
%{_iconsdir}/hicolor/*x*/apps/org.widelands.Widelands.png
@@ -124,139 +131,146 @@ rm -rf $RPM_BUILD_ROOT
%files data
%defattr(644,root,root,755)
-%dir %{_datadir}/games/%{name}
-%{_datadir}/games/%{name}/ai
-%{_datadir}/games/%{name}/campaigns
-%dir %{_datadir}/games/%{name}/i18n
-%{_datadir}/games/%{name}/i18n/fonts.lua
-%{_datadir}/games/%{name}/i18n/locales.lua
-%dir %{_datadir}/games/%{name}/i18n/fonts
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/ai
+%{_datadir}/%{name}/campaigns
+%dir %{_datadir}//%{name}/i18n
+%{_datadir}/%{name}/i18n/fonts.lua
+%{_datadir}/%{name}/i18n/locales.lua
+%dir %{_datadir}/%{name}/i18n/fonts
# font-set=hebrew
-%lang(he) %{_datadir}/games/%{name}/i18n/fonts/Culmus
+%lang(he) %{_datadir}/%{name}/i18n/fonts/Culmus
# font-set=default
-%{_datadir}/games/%{name}/i18n/fonts/DejaVu
+%{_datadir}/%{name}/i18n/fonts/DejaVu
# font-set=cjk
-%lang(ja,ko,zh_CN,zh_TW) %{_datadir}/games/%{name}/i18n/fonts/MicroHei
+%lang(ja,ko,zh_CN,zh_TW) %{_datadir}/%{name}/i18n/fonts/MicroHei
# font-set=devanagari
-%lang(hi,mr) %{_datadir}/games/%{name}/i18n/fonts/Nakula
-%{_datadir}/games/%{name}/i18n/fonts/Widelands
+%lang(hi,mr) %{_datadir}/%{name}/i18n/fonts/Nakula
+%{_datadir}/%{name}/i18n/fonts/Widelands
# font-set=arabic
-%lang(ar,fa,ms) %{_datadir}/games/%{name}/i18n/fonts/amiri
-%dir %{_datadir}/games/%{name}/i18n/locales
-%lang(ar) %{_datadir}/games/%{name}/i18n/locales/ar.json
-%lang(bg) %{_datadir}/games/%{name}/i18n/locales/bg.json
-%lang(br) %{_datadir}/games/%{name}/i18n/locales/br.json
-%lang(ca) %{_datadir}/games/%{name}/i18n/locales/ca.json
-%lang(cs) %{_datadir}/games/%{name}/i18n/locales/cs.json
-%lang(da) %{_datadir}/games/%{name}/i18n/locales/da.json
-%lang(de) %{_datadir}/games/%{name}/i18n/locales/de.json
-%lang(el) %{_datadir}/games/%{name}/i18n/locales/el.json
-%lang(en_GB) %{_datadir}/games/%{name}/i18n/locales/en_GB.json
-%lang(en_US) %{_datadir}/games/%{name}/i18n/locales/en_US.json
-%lang(eo) %{_datadir}/games/%{name}/i18n/locales/eo.json
-%lang(es) %{_datadir}/games/%{name}/i18n/locales/es.json
-%lang(eu) %{_datadir}/games/%{name}/i18n/locales/eu.json
-%lang(fa) %{_datadir}/games/%{name}/i18n/locales/fa.json
-%lang(fi) %{_datadir}/games/%{name}/i18n/locales/fi.json
-%lang(fr) %{_datadir}/games/%{name}/i18n/locales/fr.json
-%lang(fy) %{_datadir}/games/%{name}/i18n/locales/fy.json
-%lang(ga) %{_datadir}/games/%{name}/i18n/locales/ga.json
-%lang(gd) %{_datadir}/games/%{name}/i18n/locales/gd.json
-%lang(gl) %{_datadir}/games/%{name}/i18n/locales/gl.json
-%lang(he) %{_datadir}/games/%{name}/i18n/locales/he.json
-%lang(hi) %{_datadir}/games/%{name}/i18n/locales/hi.json
-%lang(hr) %{_datadir}/games/%{name}/i18n/locales/hr.json
-%lang(hu) %{_datadir}/games/%{name}/i18n/locales/hu.json
-%lang(id) %{_datadir}/games/%{name}/i18n/locales/id.json
-%lang(ig) %{_datadir}/games/%{name}/i18n/locales/ig.json
-%lang(it) %{_datadir}/games/%{name}/i18n/locales/it.json
-%lang(ja) %{_datadir}/games/%{name}/i18n/locales/ja.json
-%lang(ka) %{_datadir}/games/%{name}/i18n/locales/ka.json
-%lang(ko) %{_datadir}/games/%{name}/i18n/locales/ko.json
-%lang(krl) %{_datadir}/games/%{name}/i18n/locales/krl.json
-%lang(la) %{_datadir}/games/%{name}/i18n/locales/la.json
-%{_datadir}/games/%{name}/i18n/locales/locales_translators.json
-%lang(lt) %{_datadir}/games/%{name}/i18n/locales/lt.json
-%lang(ms) %{_datadir}/games/%{name}/i18n/locales/ms.json
-%lang(nb) %{_datadir}/games/%{name}/i18n/locales/nb.json
-%lang(nds) %{_datadir}/games/%{name}/i18n/locales/nds.json
-%lang(nl) %{_datadir}/games/%{name}/i18n/locales/nl.json
-%lang(nn) %{_datadir}/games/%{name}/i18n/locales/nn.json
-%lang(pl) %{_datadir}/games/%{name}/i18n/locales/pl.json
-%lang(pt) %{_datadir}/games/%{name}/i18n/locales/pt.json
-%lang(pt_BR) %{_datadir}/games/%{name}/i18n/locales/pt_BR.json
-%lang(ro) %{_datadir}/games/%{name}/i18n/locales/ro.json
-%lang(ru) %{_datadir}/games/%{name}/i18n/locales/ru.json
-%lang(sk) %{_datadir}/games/%{name}/i18n/locales/sk.json
-%lang(sl) %{_datadir}/games/%{name}/i18n/locales/sl.json
-%lang(sr) %{_datadir}/games/%{name}/i18n/locales/sr.json
-%lang(sr_RS) %{_datadir}/games/%{name}/i18n/locales/sr_RS.json
-%lang(sv) %{_datadir}/games/%{name}/i18n/locales/sv.json
-%lang(tr) %{_datadir}/games/%{name}/i18n/locales/tr.json
-%lang(uk) %{_datadir}/games/%{name}/i18n/locales/uk.json
-%lang(zh_CN) %{_datadir}/games/%{name}/i18n/locales/zh_CN.json
-%lang(zh_TW) %{_datadir}/games/%{name}/i18n/locales/zh_TW.json
-%{_datadir}/games/%{name}/i18n/translation_stats.conf
-%{_datadir}/games/%{name}/images
-%dir %{_datadir}/games/%{name}/locale
-%lang(ar) %{_datadir}/games/%{name}/locale/ar
-%lang(bg) %{_datadir}/games/%{name}/locale/bg
-%lang(br) %{_datadir}/games/%{name}/locale/br
-%lang(ca) %{_datadir}/games/%{name}/locale/ca
-%lang(cs) %{_datadir}/games/%{name}/locale/cs
-%lang(da) %{_datadir}/games/%{name}/locale/da
-%lang(de) %{_datadir}/games/%{name}/locale/de
-%lang(el) %{_datadir}/games/%{name}/locale/el
-%lang(en_GB) %{_datadir}/games/%{name}/locale/en_GB
-%lang(en_US) %{_datadir}/games/%{name}/locale/en_US
-%lang(eo) %{_datadir}/games/%{name}/locale/eo
-%lang(es) %{_datadir}/games/%{name}/locale/es
-%lang(eu) %{_datadir}/games/%{name}/locale/eu
-%lang(fa) %{_datadir}/games/%{name}/locale/fa
-%lang(fi) %{_datadir}/games/%{name}/locale/fi
-%lang(fr) %{_datadir}/games/%{name}/locale/fr
-%lang(fy) %{_datadir}/games/%{name}/locale/fy
-%lang(ga) %{_datadir}/games/%{name}/locale/ga
-%lang(gd) %{_datadir}/games/%{name}/locale/gd
-%lang(gl) %{_datadir}/games/%{name}/locale/gl
-%lang(he) %{_datadir}/games/%{name}/locale/he
-%lang(hi) %{_datadir}/games/%{name}/locale/hi
-%lang(hr) %{_datadir}/games/%{name}/locale/hr
-%lang(hu) %{_datadir}/games/%{name}/locale/hu
-%lang(id) %{_datadir}/games/%{name}/locale/id
-%lang(ig) %{_datadir}/games/%{name}/locale/ig
-%lang(it) %{_datadir}/games/%{name}/locale/it
-%lang(ja) %{_datadir}/games/%{name}/locale/ja
-%lang(ka) %{_datadir}/games/%{name}/locale/ka
-%lang(ko) %{_datadir}/games/%{name}/locale/ko
-%lang(krl) %{_datadir}/games/%{name}/locale/krl
-%lang(la) %{_datadir}/games/%{name}/locale/la
-%lang(lt) %{_datadir}/games/%{name}/locale/lt
-%lang(ms) %{_datadir}/games/%{name}/locale/ms
-%lang(nb) %{_datadir}/games/%{name}/locale/nb
-%lang(nds) %{_datadir}/games/%{name}/locale/nds
-%lang(nl) %{_datadir}/games/%{name}/locale/nl
-%lang(nn) %{_datadir}/games/%{name}/locale/nn
-%lang(pl) %{_datadir}/games/%{name}/locale/pl
-%lang(pt) %{_datadir}/games/%{name}/locale/pt
-%lang(pt_BR) %{_datadir}/games/%{name}/locale/pt_BR
-%lang(ro) %{_datadir}/games/%{name}/locale/ro
-%lang(ru) %{_datadir}/games/%{name}/locale/ru
-%lang(sk) %{_datadir}/games/%{name}/locale/sk
-%lang(sl) %{_datadir}/games/%{name}/locale/sl
-%lang(sr) %{_datadir}/games/%{name}/locale/sr
-%lang(sr_RS) %{_datadir}/games/%{name}/locale/sr_RS
-%lang(sv) %{_datadir}/games/%{name}/locale/sv
-%lang(tr) %{_datadir}/games/%{name}/locale/tr
-%lang(uk) %{_datadir}/games/%{name}/locale/uk
-%lang(zh_CN) %{_datadir}/games/%{name}/locale/zh_CN
-%lang(zh_TW) %{_datadir}/games/%{name}/locale/zh_TW
-%{_datadir}/games/%{name}/maps
-%{_datadir}/games/%{name}/music
-%{_datadir}/games/%{name}/scripting
-%{_datadir}/games/%{name}/shaders
-%{_datadir}/games/%{name}/sound
-%{_datadir}/games/%{name}/templates
-%{_datadir}/games/%{name}/tribes
-%{_datadir}/games/%{name}/txts
-%{_datadir}/games/%{name}/world
+%lang(ar,fa,ms) %{_datadir}/%{name}/i18n/fonts/amiri
+%dir %{_datadir}/%{name}/i18n/locales
+%lang(ar) %{_datadir}/%{name}/i18n/locales/ar.json
+%lang(bg) %{_datadir}/%{name}/i18n/locales/bg.json
+%lang(br) %{_datadir}/%{name}/i18n/locales/br.json
+%lang(ca) %{_datadir}/%{name}/i18n/locales/ca.json
+%lang(cs) %{_datadir}/%{name}/i18n/locales/cs.json
+%lang(da) %{_datadir}/%{name}/i18n/locales/da.json
+%lang(de) %{_datadir}/%{name}/i18n/locales/de.json
+%lang(el) %{_datadir}/%{name}/i18n/locales/el.json
+%lang(en_GB) %{_datadir}/%{name}/i18n/locales/en_GB.json
+%lang(en_US) %{_datadir}/%{name}/i18n/locales/en_US.json
+%lang(eo) %{_datadir}/%{name}/i18n/locales/eo.json
+%lang(es) %{_datadir}/%{name}/i18n/locales/es.json
+%lang(eu) %{_datadir}/%{name}/i18n/locales/eu.json
+%lang(fa) %{_datadir}/%{name}/i18n/locales/fa.json
+%lang(fi) %{_datadir}/%{name}/i18n/locales/fi.json
+%lang(fr) %{_datadir}/%{name}/i18n/locales/fr.json
+%lang(fy) %{_datadir}/%{name}/i18n/locales/fy.json
+%lang(ga) %{_datadir}/%{name}/i18n/locales/ga.json
+%lang(gd) %{_datadir}/%{name}/i18n/locales/gd.json
+%lang(gl) %{_datadir}/%{name}/i18n/locales/gl.json
+%lang(he) %{_datadir}/%{name}/i18n/locales/he.json
+%lang(hi) %{_datadir}/%{name}/i18n/locales/hi.json
+%lang(hr) %{_datadir}/%{name}/i18n/locales/hr.json
+%lang(hu) %{_datadir}/%{name}/i18n/locales/hu.json
+%lang(id) %{_datadir}/%{name}/i18n/locales/id.json
+%lang(ig) %{_datadir}/%{name}/i18n/locales/ig.json
+%lang(it) %{_datadir}/%{name}/i18n/locales/it.json
+%lang(ja) %{_datadir}/%{name}/i18n/locales/ja.json
+%lang(ka) %{_datadir}/%{name}/i18n/locales/ka.json
+%lang(ko) %{_datadir}/%{name}/i18n/locales/ko.json
+%lang(krl) %{_datadir}/%{name}/i18n/locales/krl.json
+%lang(la) %{_datadir}/%{name}/i18n/locales/la.json
+%{_datadir}/%{name}/i18n/locales/locales_translators.json
+%lang(lt) %{_datadir}/%{name}/i18n/locales/lt.json
+%lang(ms) %{_datadir}/%{name}/i18n/locales/ms.json
+%lang(nb) %{_datadir}/%{name}/i18n/locales/nb.json
+%lang(nds) %{_datadir}/%{name}/i18n/locales/nds.json
+%lang(nl) %{_datadir}/%{name}/i18n/locales/nl.json
+%lang(nn) %{_datadir}/%{name}/i18n/locales/nn.json
+%lang(pl) %{_datadir}/%{name}/i18n/locales/pl.json
+%lang(pt) %{_datadir}/%{name}/i18n/locales/pt.json
+%lang(pt_BR) %{_datadir}/%{name}/i18n/locales/pt_BR.json
+%lang(ro) %{_datadir}/%{name}/i18n/locales/ro.json
+%lang(ru) %{_datadir}/%{name}/i18n/locales/ru.json
+%lang(sk) %{_datadir}/%{name}/i18n/locales/sk.json
+%lang(sl) %{_datadir}/%{name}/i18n/locales/sl.json
+%lang(sr) %{_datadir}/%{name}/i18n/locales/sr.json
+%lang(sr_RS) %{_datadir}/%{name}/i18n/locales/sr_RS.json
+%lang(sv) %{_datadir}/%{name}/i18n/locales/sv.json
+%lang(tr) %{_datadir}/%{name}/i18n/locales/tr.json
+%lang(uk) %{_datadir}/%{name}/i18n/locales/uk.json
+%lang(zh_CN) %{_datadir}/%{name}/i18n/locales/zh_CN.json
+%lang(zh_TW) %{_datadir}/%{name}/i18n/locales/zh_TW.json
+%{_datadir}/%{name}/i18n/translation_stats.conf
+%{_datadir}/%{name}/images
+%dir %{_datadir}/%{name}/locale
+%lang(ar) %{_datadir}/%{name}/locale/ar
+%lang(bg) %{_datadir}/%{name}/locale/bg
+%lang(br) %{_datadir}/%{name}/locale/br
+%lang(ca) %{_datadir}/%{name}/locale/ca
+%lang(cs) %{_datadir}/%{name}/locale/cs
+%lang(da) %{_datadir}/%{name}/locale/da
+%lang(de) %{_datadir}/%{name}/locale/de
+%lang(el) %{_datadir}/%{name}/locale/el
+%lang(en_GB) %{_datadir}/%{name}/locale/en_GB
+%lang(en_US) %{_datadir}/%{name}/locale/en_US
+%lang(eo) %{_datadir}/%{name}/locale/eo
+%lang(es) %{_datadir}/%{name}/locale/es
+%lang(eu) %{_datadir}/%{name}/locale/eu
+%lang(fa) %{_datadir}/%{name}/locale/fa
+%lang(fi) %{_datadir}/%{name}/locale/fi
+%lang(fr) %{_datadir}/%{name}/locale/fr
+%lang(fy) %{_datadir}/%{name}/locale/fy
+%lang(ga) %{_datadir}/%{name}/locale/ga
+%lang(gd) %{_datadir}/%{name}/locale/gd
+%lang(gl) %{_datadir}/%{name}/locale/gl
+%lang(he) %{_datadir}/%{name}/locale/he
+%lang(hi) %{_datadir}/%{name}/locale/hi
+%lang(hr) %{_datadir}/%{name}/locale/hr
+%lang(hu) %{_datadir}/%{name}/locale/hu
+%lang(id) %{_datadir}/%{name}/locale/id
+%lang(ig) %{_datadir}/%{name}/locale/ig
+%lang(it) %{_datadir}/%{name}/locale/it
+%lang(ja) %{_datadir}/%{name}/locale/ja
+%lang(ka) %{_datadir}/%{name}/locale/ka
+%lang(ko) %{_datadir}/%{name}/locale/ko
+%lang(krl) %{_datadir}/%{name}/locale/krl
+%lang(la) %{_datadir}/%{name}/locale/la
+%lang(lt) %{_datadir}/%{name}/locale/lt
+%lang(ms) %{_datadir}/%{name}/locale/ms
+%lang(nb) %{_datadir}/%{name}/locale/nb
+%lang(nds) %{_datadir}/%{name}/locale/nds
+%lang(nl) %{_datadir}/%{name}/locale/nl
+%lang(nn) %{_datadir}/%{name}/locale/nn
+%lang(pl) %{_datadir}/%{name}/locale/pl
+%lang(pt) %{_datadir}/%{name}/locale/pt
+%lang(pt_BR) %{_datadir}/%{name}/locale/pt_BR
+%lang(ro) %{_datadir}/%{name}/locale/ro
+%lang(ru) %{_datadir}/%{name}/locale/ru
+%lang(sk) %{_datadir}/%{name}/locale/sk
+%lang(sl) %{_datadir}/%{name}/locale/sl
+%lang(sr) %{_datadir}/%{name}/locale/sr
+%lang(sr_RS) %{_datadir}/%{name}/locale/sr_RS
+%lang(sv) %{_datadir}/%{name}/locale/sv
+%lang(tr) %{_datadir}/%{name}/locale/tr
+%lang(uk) %{_datadir}/%{name}/locale/uk
+%lang(zh_CN) %{_datadir}/%{name}/locale/zh_CN
+%lang(zh_TW) %{_datadir}/%{name}/locale/zh_TW
+%{_datadir}/%{name}/maps
+%{_datadir}/%{name}/music
+%{_datadir}/%{name}/scripting
+%{_datadir}/%{name}/shaders
+%{_datadir}/%{name}/sound
+%{_datadir}/%{name}/templates
+%{_datadir}/%{name}/tribes
+%{_datadir}/%{name}/txts
+%{_datadir}/%{name}/world
+%{_datadir}/%{name}/datadirversion
+
+%files debug
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/wl_create_spritesheet
+%attr(755,root,root) %{_bindir}/wl_map_info
+%attr(755,root,root) %{_bindir}/wl_map_object_info
diff --git a/gcc11.patch b/gcc11.patch
deleted file mode 100644
index 503cb4a..0000000
--- a/gcc11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- widelands-1.0/src/network/bufferedconnection.h~ 2021-06-14 11:22:20.000000000 +0200
-+++ widelands-1.0/src/network/bufferedconnection.h 2022-01-22 22:32:52.167781192 +0100
-@@ -20,6 +20,7 @@
- #ifndef WL_NETWORK_BUFFEREDCONNECTION_H
- #define WL_NETWORK_BUFFEREDCONNECTION_H
-
-+#include <map>
- #include <memory>
- #include <mutex>
- #include <thread>
diff --git a/widelands-install.patch b/widelands-install.patch
deleted file mode 100644
index b0da683..0000000
--- a/widelands-install.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- widelands-build21/xdg/CMakeLists.txt.orig 2020-07-12 21:33:44.000000000 +0200
-+++ widelands-build21/xdg/CMakeLists.txt 2020-07-29 06:20:12.689266184 +0200
-@@ -6,19 +6,19 @@
- list(APPEND icon_sizes "16" "32" "48" "64" "128")
- foreach (icon_size ${icon_sizes})
- #install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
-- install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ../share/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
-+ install(FILES ${CMAKE_SOURCE_DIR}/data/images/logos/wl-ico-${icon_size}.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${icon_size}x${icon_size}/apps RENAME ${XDG_APPLICATION_ID}.png)
- endforeach (icon_size ${icon_sizes})
- #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ${CMAKE_INSTALL_MANDIR}/man6)
--install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ../share/man/man6)
-+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.6 DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man6)
- #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
--install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION ../share/applications)
-+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
- #install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
--install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ../share/metainfo)
-+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${XDG_APPLICATION_ID}.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
-
- find_program(GTK_UPDATE_ICON_CACHE NAMES gtk-update-icon-cache)
- if (GTK_UPDATE_ICON_CACHE)
- #install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor ||: )")
-- install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_PREFIX}/../share/icons/hicolor ||: )")
-+ install(CODE "execute_process (COMMAND ${GTK_UPDATE_ICON_CACHE} -t -f ${CMAKE_INSTALL_DATADIR}/icons/hicolor ||: )")
- else (GTK_UPDATE_ICON_CACHE)
- message(WARNING "gtk-update-icon-cache not found!")
- endif (GTK_UPDATE_ICON_CACHE)
diff --git a/widelands-pld.patch b/widelands-pld.patch
index 1025919..23d025d 100644
--- a/widelands-pld.patch
+++ b/widelands-pld.patch
@@ -1,9 +1,9 @@
---- widelands-build21/CMakeLists.txt.orig 2020-07-12 21:33:44.000000000 +0200
-+++ widelands-build21/CMakeLists.txt 2020-07-28 21:55:52.652415900 +0200
-@@ -201,6 +201,10 @@
- endif ()
- set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
- option(OPTION_ASAN "Build with AddressSanitizer" ON)
+--- widelands-1.1/CMakeLists.txt~ 2022-10-22 11:51:16.000000000 +0000
++++ widelands-1.1/CMakeLists.txt 2023-02-04 16:06:13.829565579 +0000
+@@ -251,6 +251,10 @@
+ endif()
+ elseif(CMAKE_BUILD_TYPE STREQUAL "None")
+ message(STATUS "Not setting any default flags.")
+elseif(CMAKE_BUILD_TYPE STREQUAL "PLD")
+ set(WL_OPTIMIZE_FLAGS "")
+ set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
@@ -11,60 +11,68 @@
else()
message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
endif()
-@@ -353,7 +357,6 @@
+@@ -372,7 +376,7 @@
+ endif()
+
+ if(NOT MSVC)
+- if(CMAKE_BUILD_TYPE STREQUAL "Release")
++ if( (CMAKE_BUILD_TYPE STREQUAL "PLD") OR (CMAKE_BUILD_TYPE STREQUAL "Release") )
+ message(STATUS "Compiler warnings will be ignored.")
+ elseif(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND
+ (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.0)) AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.2))
+@@ -500,7 +504,6 @@
install (
FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
DESTINATION ${WL_INSTALL_BASEDIR}
-- CONFIGURATIONS Debug;Release
+- CONFIGURATIONS Debug;Release;None
COMPONENT CoreVersionFile
)
-@@ -378,7 +381,6 @@
+@@ -516,7 +519,6 @@
+ FILES
+ data/datadirversion
+ DESTINATION ${WL_INSTALL_DATADIR}
+- CONFIGURATIONS Debug;Release;None
+ COMPONENT VersionFile
+ )
+
+@@ -533,7 +535,6 @@
data/txts
data/world
DESTINATION ${WL_INSTALL_DATADIR}
-- CONFIGURATIONS Debug;Release
+- CONFIGURATIONS Debug;Release;None
COMPONENT CoreDataFiles
)
-@@ -386,7 +388,6 @@
+@@ -541,7 +542,6 @@
DIRECTORY
data/maps
DESTINATION ${WL_INSTALL_DATADIR}
-- CONFIGURATIONS Debug;Release
+- CONFIGURATIONS Debug;Release;None
COMPONENT MapFiles
)
-@@ -395,7 +396,6 @@
+@@ -550,7 +550,6 @@
data/music
data/sound
DESTINATION ${WL_INSTALL_DATADIR}
-- CONFIGURATIONS Debug;Release
+- CONFIGURATIONS Debug;Release;None
COMPONENT MusicFiles
)
-@@ -405,7 +405,6 @@
+@@ -560,7 +559,6 @@
CREDITS
ChangeLog
DESTINATION ${WL_INSTALL_BASEDIR}
-- CONFIGURATIONS Debug;Release
+- CONFIGURATIONS Debug;Release;None
COMPONENT CoreLicenseFiles
)
-@@ -424,7 +423,6 @@
- DIRECTORY
- ${CMAKE_CURRENT_BINARY_DIR}/locale/
- DESTINATION ${WL_INSTALL_DATADIR}/locale
-- CONFIGURATIONS Debug;Release
- COMPONENT CoreLanguageFiles
- )
-
---- widelands-build19-src/cmake/WlFunctions.cmake.orig 2016-11-10 08:28:01.000000000 +0100
-+++ widelands-build19-src/cmake/WlFunctions.cmake 2017-07-15 20:20:09.604392035 +0200
-@@ -276,5 +276,5 @@
-
- #Quoting the CMake documentation on DESTINATION:
- #"If a relative path is given it is interpreted relative to the value of CMAKE_INSTALL_PREFIX"
-- install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles)
-+ install(TARGETS ${NAME} DESTINATION "bin" COMPONENT ExecutableFiles)
- endfunction()
+@@ -579,7 +577,6 @@
+ DIRECTORY
+ ${CMAKE_CURRENT_BINARY_DIR}/locale/
+ DESTINATION ${WL_INSTALL_DATADIR}/locale
+- CONFIGURATIONS Debug;Release;None
+ COMPONENT CoreLanguageFiles
+ )
+ endif(OPTION_BUILD_TRANSLATIONS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/widelands.git/commitdiff/2be483d6184dc35d91b9108b1f35a4706a59ff4f
More information about the pld-cvs-commit
mailing list