Skip to content

Instantly share code, notes, and snippets.

@stubb
stubb / oglft_patch.diff
Last active February 29, 2016 15:44
Patch for oglft to include freetype path and allow shared building.
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (Revision 112)
+++ CMakeLists.txt (Arbeitskopie)
@@ -1,10 +1,13 @@
# $Id$
project( OGLFT )
-set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/config )
+#set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/config )
<!-- based on http://www.tutorialspoint.com/html5/html5_websocket.htm -->
<!DOCTYPE HTML>
<html>
<head>
<script type="text/javascript">
function openWebSocket()
{
var startTime;
var endTime;
if ("WebSocket" in window)
def get_unit_tooltip(self, unit_id):
"""Tries to identify unit properties to display as tooltip.
#TODO Should be extended later to also include movement speed, etc."""
helptexts = [] # collects all information we will find
unit = Entities.units[unit_id]
try:
comp = unit.get_component_template('StorageComponent')
print 'a'
print type(comp)
print 'b'
Recreating all atlases
Traceback (most recent call last):
File "run_uh.py", line 382, in <module>
main()
File "run_uh.py", line 191, in main
ret = horizons.main.start(options)
File "/home/kili/Repositories/unknown-horizons/horizons/main.py", line 204, in start
Entities.load(horizons.globals.db, load_now=False) # create all references
File "/home/kili/Repositories/unknown-horizons/horizons/entities.py", line 60, in load
cls.load_grounds(db, load_now)
# Encoding: utf-8
# ###################################################
# Copyright (C) 2008-2013 The Unknown Horizons Team
# team@unknown-horizons.org
# This file is part of Unknown Horizons.
#
# Unknown Horizons is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
Creating build folder: ../../build/build_201310092118
Copying UH...
Copying Python...
Running Setup...
Generating translations for af.po
Generating translations for bg.po
Generating translations for ca.po
Generating translations for ca@valencia.po
Generating translations for cs.po
Generating translations for da.po
C:\Program Files (x86)\Unknown Horizons>python\python.exe run_uh.py --debug-log-
only
Logging to C:\Users\kili\Documents\My Games\unknown-horizons\log\unknown-horizon
s-2013-10-09_20-45-52.log and C:\Program Files (x86)\Unknown Horizons\fife.log
Failed to load content\maps\development.sqlite
Traceback (most recent call last):
File "C:\Program Files (x86)\Unknown Horizons\horizons\main.py", line 334, in
start_singleplayer
_modules.session.load(options)
Failed to load content/maps/development.sqlite
Traceback (most recent call last):
File "/home/kili/Repositories/unknown-horizons/horizons/main.py", line 330, in start_singleplayer
_modules.session.load(options)
File "/home/kili/Repositories/unknown-horizons/horizons/spsession.py", line 43, in load
super(SPSession, self).load(*args, **kwargs)
File "/home/kili/Repositories/unknown-horizons/horizons/session.py", line 262, in load
self.ingame_gui = self._ingame_gui_class(self)
File "/home/kili/Repositories/unknown-horizons/horizons/gui/ingamegui.py", line 136, in __init__
self.resource_overview = ResourceOverviewBar(self.session)
python2 run_uh.py --start-map=/home/kili/Repositories/unknown-horizons/tests/game/fixtures/blackdeath.sqlite
libpng warning: iCCP: known incorrect sRGB profile
Failed to load /home/kili/Repositories/unknown-horizons/tests/game/fixtures/blackdeath.sqlite
Traceback (most recent call last):
File "/home/kili/Repositories/unknown-horizons/horizons/main.py", line 330, in start_singleplayer
_modules.session.load(options)
File "/home/kili/Repositories/unknown-horizons/horizons/spsession.py", line 43, in load
super(SPSession, self).load(*args, **kwargs)
File "/home/kili/Repositories/unknown-horizons/horizons/session.py", line 228, in load
self.view.resize_layers(savegame_db)
python2 run_tests.py --nologcapture -a gui tests.gui.ingame.test_bugs.test_ticket_1368
E
======================================================================
ERROR: Failure: TypeError (issubclass() arg 1 must be a class)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/usr/lib/python2.7/site-packages/nose/loader.py", line 518, in makeTest
return self._makeTest(obj, parent)
File "/usr/lib/python2.7/site-packages/nose/loader.py", line 571, in _makeTest
if issubclass(parent, unittest.TestCase):