[packages/widelands] - updated to build21 - updated pld patch - removed obsolete icu patch - added install patch (fix dat

qboosh qboosh at pld-linux.org
Wed Jul 29 16:36:42 CEST 2020 

commit a9828edf842e61d8e38f780abebf42b2e65a0e83
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jul 29 16:38:28 2020 +0200

    - updated to build21
    - updated pld patch
    - removed obsolete icu patch
    - added install patch (fix data install)
    - use upstream .desktop file

 widelands-icu.patch     | 11 -------
 widelands-install.patch | 27 ++++++++++++++++
 widelands-pld.patch     | 28 ++++++++--------
 widelands.desktop       |  9 ------
 widelands.spec          | 85 +++++++++++++++++++------------------------------
 5 files changed, 73 insertions(+), 87 deletions(-)
---
diff --git a/widelands.spec b/widelands.spec
index 9bfdd09..0f1d370 100644
--- a/widelands.spec
+++ b/widelands.spec
@@ -2,27 +2,25 @@
 # - check locales
 # - use system fonts where possible
 #
-%define		buildver	19
-Summary:	Game like Settlers II
-Summary(pl.UTF-8):	Remake gry Settlers II
+%define		buildver	21
+Summary:	A real-time build-up strategy game
+Summary(pl.UTF-8):	Gra strategiczna czasu rzeczywistego z budowaniem
 Name:		widelands
 Version:	0.build%{buildver}
-Release:	6
+Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games
 #Source0Download: https://wl.widelands.org/wiki/Download/#release
-Source0:	http://launchpad.net/widelands/build%{buildver}/build%{buildver}/+download/%{name}-build%{buildver}-src.tar.bz2
-# Source0-md5:	0ef7ccf021b8001056739f755500366d
-Source1:	%{name}.desktop
+Source0:	http://launchpad.net/widelands/build%{buildver}/build%{buildver}/+download/%{name}-build%{buildver}-source.tar.gz
+# Source0-md5:	2933da247b2009f5608e92624d606851
 Patch0:		%{name}-pld.patch
 Patch1:		gcc8.patch
-Patch2:		%{name}-icu.patch
+Patch2:		%{name}-install.patch
 URL:		https://wl.widelands.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	SDL2-devel >= 2
 BuildRequires:	SDL2_image-devel >= 2
 BuildRequires:	SDL2_mixer-devel >= 2
-BuildRequires:	SDL2_net-devel >= 2
 BuildRequires:	SDL2_ttf-devel >= 2.0.12
 BuildRequires:	boost-devel >= 1.48
 BuildRequires:	cmake >= 2.8.7
@@ -30,7 +28,7 @@ BuildRequires:	gettext-tools
 BuildRequires:	glew-devel
 BuildRequires:	libicu-devel
 BuildRequires:	libpng-devel
-BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	libstdc++-devel >= 6:4.8
 BuildRequires:	python >= 2
 BuildRequires:	python-modules >= 2
 BuildRequires:	rpmbuild(macros) >= 1.605
@@ -60,21 +58,23 @@ nastawione i rozpocząć z Tobą handel. Jednak, jeśli chcesz rządzić
 światem, będziesz musiał wyszkolić żołnierzy i walczyć.
 
 %package data
-Summary:	Game like Settlers II - data files
-Summary(pl.UTF-8):	Remake gry Settlers II - pliki danych
+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
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:	noarch
 %endif
 
 %description data
-Game like Settlers II - data files.
+Data files for Widelands, a real-time build-up strategy game inspired
+by Settlers II.
 
 %description data -l pl.UTF-8
-Remake gry Settlers II - pliki danych.
+Pliki danych do Widelands - gry strategicznej czasu rzeczywistego z
+budowaniem, zainspirowanej Settlers II.
 
 %prep
-%setup -q -n %{name}-build%{buildver}-src
+%setup -q -n %{name}-build%{buildver}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -95,14 +95,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# desktop and icons
-install -d $RPM_BUILD_ROOT%{_desktopdir}
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-for s in 16 32 48 64 128 ; do
-	install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${s}x${s}/apps
-	cp -p data/images/logos/wl-ico-${s}.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${s}x${s}/apps/widelands.png
-done
-
 # VERSION unneeded, COPYING generic GPL v2, the rest packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_prefix}/{COPYING,CREDITS,ChangeLog,VERSION}
 
@@ -113,15 +105,18 @@ 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
-%attr(755,root,root) %{_bindir}/wl_render_richtext
-%{_desktopdir}/widelands.desktop
-%{_iconsdir}/hicolor/*x*/apps/widelands.png
+%{_datadir}/metainfo/org.widelands.Widelands.appdata.xml
+%{_desktopdir}/org.widelands.Widelands.desktop
+%{_iconsdir}/hicolor/*x*/apps/org.widelands.Widelands.png
+%{_mandir}/man6/widelands.6*
 
 %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
@@ -135,16 +130,11 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja,ko,zh_CN,zh_TW) %{_datadir}/games/%{name}/i18n/fonts/MicroHei
 # font-set=devanagari
 %lang(hi,mr) %{_datadir}/games/%{name}/i18n/fonts/Nakula
-# font-set=sinhala
-%lang(si) %{_datadir}/games/%{name}/i18n/fonts/Sinhala
 %{_datadir}/games/%{name}/i18n/fonts/Widelands
 # font-set=arabic
 %lang(ar,fa,ms) %{_datadir}/games/%{name}/i18n/fonts/amiri
-# font-set=myanmar
-%lang(my) %{_datadir}/games/%{name}/i18n/fonts/mmrCensus
 %dir %{_datadir}/games/%{name}/i18n/locales
 %lang(ar) %{_datadir}/games/%{name}/i18n/locales/ar.json
-%lang(ast) %{_datadir}/games/%{name}/i18n/locales/ast.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
@@ -152,61 +142,55 @@ rm -rf $RPM_BUILD_ROOT
 %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_CA) %{_datadir}/games/%{name}/i18n/locales/en_CA.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(et) %{_datadir}/games/%{name}/i18n/locales/et.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(ia) %{_datadir}/games/%{name}/i18n/locales/ia.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(jv) %{_datadir}/games/%{name}/i18n/locales/jv.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(mr) %{_datadir}/games/%{name}/i18n/locales/mr.json
 %lang(ms) %{_datadir}/games/%{name}/i18n/locales/ms.json
-%lang(my) %{_datadir}/games/%{name}/i18n/locales/my.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(oc) %{_datadir}/games/%{name}/i18n/locales/oc.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(rw) %{_datadir}/games/%{name}/i18n/locales/rw.json
-%lang(si) %{_datadir}/games/%{name}/i18n/locales/si.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(vi) %{_datadir}/games/%{name}/i18n/locales/vi.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(ast) %{_datadir}/games/%{name}/locale/ast
 %lang(bg) %{_datadir}/games/%{name}/locale/bg
 %lang(br) %{_datadir}/games/%{name}/locale/br
 %lang(ca) %{_datadir}/games/%{name}/locale/ca
@@ -214,54 +198,48 @@ rm -rf $RPM_BUILD_ROOT
 %lang(da) %{_datadir}/games/%{name}/locale/da
 %lang(de) %{_datadir}/games/%{name}/locale/de
 %lang(el) %{_datadir}/games/%{name}/locale/el
-%lang(en_CA) %{_datadir}/games/%{name}/locale/en_CA
 %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(et) %{_datadir}/games/%{name}/locale/et
 %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(ia) %{_datadir}/games/%{name}/locale/ia
 %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(jv) %{_datadir}/games/%{name}/locale/jv
 %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(mr) %{_datadir}/games/%{name}/locale/mr
 %lang(ms) %{_datadir}/games/%{name}/locale/ms
-%lang(my) %{_datadir}/games/%{name}/locale/my
 %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(oc) %{_datadir}/games/%{name}/locale/oc
 %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(rw) %{_datadir}/games/%{name}/locale/rw
-%lang(si) %{_datadir}/games/%{name}/locale/si
 %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(vi) %{_datadir}/games/%{name}/locale/vi
 %lang(zh_CN) %{_datadir}/games/%{name}/locale/zh_CN
 %lang(zh_TW) %{_datadir}/games/%{name}/locale/zh_TW
 %{_datadir}/games/%{name}/maps
@@ -269,6 +247,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_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
diff --git a/widelands-icu.patch b/widelands-icu.patch
deleted file mode 100644
index 22b7a27..0000000
--- a/widelands-icu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- widelands-build19-src/src/graphic/text/bidi.h.orig	2016-11-10 08:28:01.000000000 +0100
-+++ widelands-build19-src/src/graphic/text/bidi.h	2019-04-13 14:11:05.664106041 +0200
-@@ -40,7 +40,7 @@
- // True if a string contains a character from the script's code blocks
- bool has_script_character(const char* input, UI::FontSets::Selector script);
- UI::FontSet const* find_fontset(const char* word, const UI::FontSets& fontsets);
--std::string icustring2string(const UnicodeString& convertme);
-+std::string icustring2string(const icu::UnicodeString& convertme);
- std::string icuchar2string(const UChar& convertme);
- bool cannot_start_line(const UChar& c);
- bool cannot_end_line(const UChar& c);
diff --git a/widelands-install.patch b/widelands-install.patch
new file mode 100644
index 0000000..b0da683
--- /dev/null
+++ b/widelands-install.patch
@@ -0,0 +1,27 @@
+--- 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 2e906a0..1025919 100644
--- a/widelands-pld.patch
+++ b/widelands-pld.patch
@@ -1,18 +1,17 @@
---- widelands-build19-src/CMakeLists.txt.orig	2016-11-10 08:28:01.000000000 +0100
-+++ widelands-build19-src/CMakeLists.txt	2017-07-15 17:41:44.154500573 +0200
-@@ -98,6 +98,9 @@
- elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
-   set(WL_OPTIMIZE_FLAGS "-O3")
-   set(WL_DEBUG_FLAGS "-g -DNDEBUG -DNOPARACHUTE")
+--- 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)
 +elseif(CMAKE_BUILD_TYPE STREQUAL "PLD")
 +  set(WL_OPTIMIZE_FLAGS "")
 +  set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
++  option(OPTION_ASAN "Build with AddressSanitizer" OFF)
  else()
    message(FATAL_ERROR "Unknown CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
  endif()
---- widelands-build19-src/CMakeLists.txt.orig	2017-07-15 17:44:06.607832280 +0200
-+++ widelands-build19-src/CMakeLists.txt	2017-07-15 18:59:17.074447445 +0200
-@@ -248,7 +248,6 @@
+@@ -353,7 +357,6 @@
  install (
    FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
    DESTINATION ${WL_INSTALL_BASEDIR}
@@ -20,7 +19,7 @@
    COMPONENT CoreVersionFile
  )
  
-@@ -271,7 +270,6 @@
+@@ -378,7 +381,6 @@
      data/txts
      data/world
    DESTINATION ${WL_INSTALL_DATADIR}
@@ -28,7 +27,7 @@
    COMPONENT CoreDataFiles
  )
  
-@@ -279,7 +277,6 @@
+@@ -386,7 +388,6 @@
    DIRECTORY
      data/maps
    DESTINATION ${WL_INSTALL_DATADIR}
@@ -36,7 +35,7 @@
    COMPONENT MapFiles
  )
  
-@@ -288,7 +285,6 @@
+@@ -395,7 +396,6 @@
      data/music
      data/sound
    DESTINATION ${WL_INSTALL_DATADIR}
@@ -44,7 +43,7 @@
    COMPONENT MusicFiles
  )
  
-@@ -298,7 +294,6 @@
+@@ -405,7 +405,6 @@
      CREDITS
      ChangeLog
    DESTINATION ${WL_INSTALL_BASEDIR}
@@ -52,13 +51,14 @@
    COMPONENT CoreLicenseFiles
  )
  
-@@ -317,6 +312,5 @@
+@@ -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 @@
diff --git a/widelands.desktop b/widelands.desktop
deleted file mode 100644
index a7f5816..0000000
--- a/widelands.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Widelands
-Comment=Clone of the game Settlers II
-Comment[pl]=Klon gry Settlers II
-Exec=widelands
-Icon=widelands
-Type=Application
-Categories=Game;StrategyGame;
-# vi: encoding=utf-8
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/widelands.git/commitdiff/a9828edf842e61d8e38f780abebf42b2e65a0e83

More information about the pld-cvs-commit mailing list