mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
games-board/pychess: remove unused patch(es)
Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/21107 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
committed by
Ionen Wolkens
Ionen Wolkens
parent
24b2771a8a
commit
9dd5e43f2c
@@ -1,46 +0,0 @@
|
||||
From 6c840c9981f2077d0fa4436b30a2f2f6650e55fb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micka=C3=ABl=20Schoentgen?= <contact@tiger-222.fr>
|
||||
Date: Mon, 13 Apr 2020 14:48:40 +0200
|
||||
Subject: [PATCH] Fix missing TreeModelFilter.sort_new_with_model() on some Gtk
|
||||
versions
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This is due to API changes, but let's keep compatibility with older versions.
|
||||
That should fix #1811.
|
||||
|
||||
Signed-off-by: Mickaël Schoentgen <contact@tiger-222.fr>
|
||||
---
|
||||
lib/pychess/perspectives/fics/__init__.py | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/lib/pychess/perspectives/fics/__init__.py b/lib/pychess/perspectives/fics/__init__.py
|
||||
index 4f956b695..1518c21e0 100644
|
||||
--- a/lib/pychess/perspectives/fics/__init__.py
|
||||
+++ b/lib/pychess/perspectives/fics/__init__.py
|
||||
@@ -27,6 +27,24 @@
|
||||
from pychess.perspectives import Perspective, perspective_manager, panel_name
|
||||
|
||||
|
||||
+if not hasattr(Gtk.TreeModelFilter, "new_with_model"):
|
||||
+ # Fix #1811: TreeModelFilter.sort_new_with_model() is missing on some Gtk versions
|
||||
+ # due to API changes. Let's keep compatibility with older versions.
|
||||
+
|
||||
+ def sort_new_with_model(self):
|
||||
+ super_object = super(Gtk.TreeModel, self)
|
||||
+ if hasattr(super_object, "sort_new_with_model"):
|
||||
+ return super_object.sort_new_with_model()
|
||||
+ return Gtk.TreeModelSort.new_with_model(self)
|
||||
+
|
||||
+ @classmethod
|
||||
+ def new_with_model(self, child_model):
|
||||
+ return Gtk.TreeModel.sort_new_with_model(child_model)
|
||||
+
|
||||
+ Gtk.TreeModel.sort_new_with_model = sort_new_with_model
|
||||
+ Gtk.TreeModelFilter.new_with_model = new_with_model
|
||||
+
|
||||
+
|
||||
class PlayerNotificationMessage(InfoBarMessage):
|
||||
|
||||
def __init__(self, message_type, content, callback, player, text):
|
||||
@@ -1,136 +0,0 @@
|
||||
From faf456bf2d081aa3cff52d0f9f714748a04628b1 Mon Sep 17 00:00:00 2001
|
||||
From: gbtami <gbtami@gmail.com>
|
||||
Date: Sat, 18 May 2019 18:50:17 +0200
|
||||
Subject: [PATCH] Fix bdist_rpm. Prevent importing GLib from setup.py
|
||||
|
||||
---
|
||||
lib/pychess/Savers/pgn.py | 8 ++++----
|
||||
lib/pychess/Utils/__init__.py | 18 ++++++++++++++++++
|
||||
lib/pychess/widgets/ChessClock.py | 20 ++------------------
|
||||
3 files changed, 24 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/lib/pychess/Savers/pgn.py b/lib/pychess/Savers/pgn.py
|
||||
index ac4238471..2b089e1d1 100644
|
||||
--- a/lib/pychess/Savers/pgn.py
|
||||
+++ b/lib/pychess/Savers/pgn.py
|
||||
@@ -10,8 +10,6 @@
|
||||
import sys
|
||||
import textwrap
|
||||
|
||||
-from gi.repository import GLib
|
||||
-
|
||||
import pexpect
|
||||
|
||||
from sqlalchemy import String
|
||||
@@ -23,7 +21,6 @@
|
||||
WON_RESIGN, DRAW, BLACKWON, WHITEWON, NORMALCHESS, DRAW_AGREE, FIRST_PAGE, PREV_PAGE, NEXT_PAGE, \
|
||||
ABORTED_REASONS, ADJOURNED_REASONS, WON_CALLFLAG, DRAW_ADJUDICATION, WON_ADJUDICATION, \
|
||||
WHITE_ENGINE_DIED, BLACK_ENGINE_DIED, RUNNING, TOOL_NONE, TOOL_CHESSDB, TOOL_SCOUTFISH
|
||||
-
|
||||
from pychess.System import conf
|
||||
from pychess.System.Log import log
|
||||
from pychess.System.protoopen import PGN_ENCODING
|
||||
@@ -35,7 +32,7 @@
|
||||
from pychess.Utils.elo import get_elo_rating_change_pgn
|
||||
from pychess.Utils.logic import getStatus
|
||||
from pychess.Variants import name2variant, NormalBoard, variants
|
||||
-from pychess.widgets.ChessClock import formatTime
|
||||
+from pychess.Utils import formatTime
|
||||
from pychess.Savers.ChessFile import ChessFile, LoadingError
|
||||
from pychess.Savers.database import col2label, TagDatabase, parseDateTag
|
||||
from pychess.Database import model as dbmodel
|
||||
@@ -460,6 +457,7 @@ def init_tag_database(self, importer=None):
|
||||
if size > 10000000:
|
||||
drop_indexes(self.engine)
|
||||
if self.progressbar is not None:
|
||||
+ from gi.repository import GLib
|
||||
GLib.idle_add(self.progressbar.set_text, _("Importing game headers..."))
|
||||
if importer is None:
|
||||
importer = PgnImport(self)
|
||||
@@ -477,6 +475,7 @@ def init_chess_db(self):
|
||||
if chess_db_path is not None and self.path and self.size > 0:
|
||||
try:
|
||||
if self.progressbar is not None:
|
||||
+ from gi.repository import GLib
|
||||
GLib.idle_add(self.progressbar.set_text, _("Creating .bin index file..."))
|
||||
self.chess_db = Parser(engine=(chess_db_path, ))
|
||||
self.chess_db.open(self.path)
|
||||
@@ -503,6 +502,7 @@ def init_scoutfish(self):
|
||||
if scoutfish_path is not None and self.path and self.size > 0:
|
||||
try:
|
||||
if self.progressbar is not None:
|
||||
+ from gi.repository import GLib
|
||||
GLib.idle_add(self.progressbar.set_text, _("Creating .scout index file..."))
|
||||
self.scoutfish = Scoutfish(engine=(scoutfish_path, ))
|
||||
self.scoutfish.open(self.path)
|
||||
diff --git a/lib/pychess/Utils/__init__.py b/lib/pychess/Utils/__init__.py
|
||||
index 481273854..038c798da 100755
|
||||
--- a/lib/pychess/Utils/__init__.py
|
||||
+++ b/lib/pychess/Utils/__init__.py
|
||||
@@ -1,9 +1,27 @@
|
||||
import asyncio
|
||||
import weakref
|
||||
+from math import ceil
|
||||
|
||||
from pychess.Utils.lutils.ldata import MATE_VALUE, MATE_DEPTH
|
||||
|
||||
|
||||
+def formatTime(seconds, clk2pgn=False):
|
||||
+ minus = ""
|
||||
+ if seconds <= -10 or seconds >= 10:
|
||||
+ seconds = ceil(seconds)
|
||||
+ if seconds < 0:
|
||||
+ minus = "-"
|
||||
+ seconds = -seconds
|
||||
+ hours, remainder = divmod(seconds, 3600)
|
||||
+ minutes, seconds = divmod(remainder, 60)
|
||||
+ if hours or clk2pgn:
|
||||
+ return minus + "%d:%02d:%02d" % (hours, minutes, seconds)
|
||||
+ elif not minutes and seconds < 10:
|
||||
+ return minus + "%.1f" % seconds
|
||||
+ else:
|
||||
+ return minus + "%d:%02d" % (minutes, seconds)
|
||||
+
|
||||
+
|
||||
def prettyPrintScore(s, depth, format_mate=False):
|
||||
"""The score parameter is an eval value from White point of view"""
|
||||
|
||||
diff --git a/lib/pychess/widgets/ChessClock.py b/lib/pychess/widgets/ChessClock.py
|
||||
index 8811d13db..740e0828a 100644
|
||||
--- a/lib/pychess/widgets/ChessClock.py
|
||||
+++ b/lib/pychess/widgets/ChessClock.py
|
||||
@@ -1,32 +1,16 @@
|
||||
# -*- coding: UTF-8 -*-
|
||||
|
||||
-from math import ceil, pi, cos, sin
|
||||
+from math import pi, cos, sin
|
||||
|
||||
import cairo
|
||||
from gi.repository import GLib, Gtk, Gdk, Pango, PangoCairo, GObject
|
||||
|
||||
from pychess.System import conf
|
||||
+from pychess.Utils import formatTime
|
||||
from pychess.Utils.const import BLACK, WHITE, LOCAL, UNFINISHED_STATES, DRAW, WHITEWON, BLACKWON, UNKNOWN_STATE
|
||||
from . import preferencesDialog
|
||||
|
||||
|
||||
-def formatTime(seconds, clk2pgn=False):
|
||||
- minus = ""
|
||||
- if seconds <= -10 or seconds >= 10:
|
||||
- seconds = ceil(seconds)
|
||||
- if seconds < 0:
|
||||
- minus = "-"
|
||||
- seconds = -seconds
|
||||
- hours, remainder = divmod(seconds, 3600)
|
||||
- minutes, seconds = divmod(remainder, 60)
|
||||
- if hours or clk2pgn:
|
||||
- return minus + "%d:%02d:%02d" % (hours, minutes, seconds)
|
||||
- elif not minutes and seconds < 10:
|
||||
- return minus + "%.1f" % seconds
|
||||
- else:
|
||||
- return minus + "%d:%02d" % (minutes, seconds)
|
||||
-
|
||||
-
|
||||
class ChessClock(Gtk.DrawingArea):
|
||||
def __init__(self):
|
||||
GObject.GObject.__init__(self)
|
||||
Reference in New Issue
Block a user