FreeDoko: update to 0.7.18. (#1542)

This commit is contained in:
John Zimmermann 2018-08-10 06:37:30 +02:00 committed by cr6git
parent b0707a7705
commit ebf5c730bb
3 changed files with 5 additions and 74 deletions

View File

@ -1,70 +0,0 @@
From f65aa2b3f51b2e3e7fb17bc893af311b01b19eb9 Mon Sep 17 00:00:00 2001
From: "Dr. Diether Knof" <dknof@gmx.de>
Date: Fri, 5 Jan 2018 15:06:33 +0100
Subject: [PATCH] =?UTF-8?q?Kompilierfehler=20f=C3=BCr=2032-Bit-Systeme=20b?=
=?UTF-8?q?ehoben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/misc/translation.cpp | 16 ----------------
src/misc/translation.h | 1 -
src/ui/gtkmm/icons.cpp | 2 +-
3 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/src/misc/translation.cpp b/src/misc/translation.cpp
index bccf7ab20..34e3a0374 100644
--- src/misc/translation.cpp
+++ src/misc/translation.cpp
@@ -218,22 +218,6 @@ replace_substring(string const& text, unsigned const param_unsigned)
return replace_substring(text, std::to_string(param_unsigned), 'u');
}
-#ifndef WINDOWS
-/**
- ** replace a substring
- **
- ** @param text text with string to replace
- ** @param param_size_t replacement to insert
- **
- ** @return text with replacements
- **/
-string
-replace_substring(string const& text, size_t const param_size_t)
-{
- return replace_substring(text, std::to_string(param_size_t), 'u');
-}
-#endif
-
/**
** replace a substring
**
diff --git a/src/misc/translation.h b/src/misc/translation.h
index ffdc7813e..ee537c734 100644
--- src/misc/translation.h
+++ src/misc/translation.h
@@ -46,7 +46,6 @@ inline string _(T const& t)
string replace_substring(string const& text, string const& s);
string replace_substring(string const& text, int i);
string replace_substring(string const& text, unsigned u);
-string replace_substring(string const& text, size_t s);
string replace_substring(string const& text, string const& replacement,
char c1, char c2 = '\0');
string replace_substrings(string const& text);
diff --git a/src/ui/gtkmm/icons.cpp b/src/ui/gtkmm/icons.cpp
index 19ae5021d..40f9138b0 100644
--- src/ui/gtkmm/icons.cpp
+++ src/ui/gtkmm/icons.cpp
@@ -722,7 +722,7 @@ Icons::load()
vector<Gdk::ScaledPixbufRotations> icon_new;
for (unsigned type = 0; type < NUMBER_OF_TYPES; type++) {
- sm.add(_("loading the icons (%u/%u)", type+1, NUMBER_OF_TYPES));
+ sm.add(_("loading the icons (%u/%u)", type+1, static_cast<unsigned>(NUMBER_OF_TYPES)));
icon_new.push_back(this->load(static_cast<Type>(type)));
if ( (::game_status == GameStatus::PROGRAMSTART)
|| (::game_status == GameStatus::PARTY_INITIAL_LOADED) )
--
2.15.1

View File

@ -1,7 +1,7 @@
# Template file for 'FreeDoko'
pkgname=FreeDoko
version=0.7.17
revision=2
version=0.7.18
revision=1
wrksrc="FreeDoko_${version}"
build_style=gnu-makefile
make_build_target="compile"
@ -10,6 +10,6 @@ makedepends="gtkmm-devel freealut-devel"
short_desc="Free implementation of the card game Doppelkopf"
maintainer="Michael Straube <straubem@gmx.de>"
homepage="http://free-doko.sourceforge.net/en/FreeDoko.html"
license="GPL-2"
license="GPL-2.0-or-later"
distfiles="${SOURCEFORGE_SITE}/free-doko/FreeDoko_${version}.src.zip"
checksum=db686536e479d3a3349dc7db1754f369d14cee02a60c9afddd004e017cf022e6
checksum=5b9ca3ad915f36dba17a4bd22b3d7d68ac2526cf125d045a819aa8d4a2cceb4c

1
srcpkgs/FreeDoko/update Normal file
View File

@ -0,0 +1 @@
ignore="*Linux *Windows"