This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/PKGBUILD b/PKGBUILD | |
index bd9a561..ee60759 100644 | |
--- a/PKGBUILD | |
+++ b/PKGBUILD | |
@@ -3,19 +3,22 @@ | |
# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> | |
pkgname=obexftp | |
-pkgver=0.24 | |
-pkgrel=12 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/PKGBUILD b/PKGBUILD | |
index aac083e..1ab7e14 100644 | |
--- a/PKGBUILD | |
+++ b/PKGBUILD | |
@@ -11,7 +11,7 @@ url="http://dev.zuckschwerdt.org/openobex/" | |
arch=('x86_64' 'i686') | |
license=('GPL' 'LGPL') | |
depends=('libusbx' 'bluez-libs') | |
-makedepends=('cmake' 'libxslt' 'doxygen' 'java-environment') | |
+makedepends=('cmake') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Program received signal SIGSEGV, Segmentation fault. | |
0x00007ffff5b82ab8 in lockf64 () from /usr/lib/libc.so.6 | |
(gdb) bt full | |
#0 0x00007ffff5b82ab8 in lockf64 () from /usr/lib/libc.so.6 | |
No symbol table info available. | |
#1 0x00007ffff42e9743 in ?? () | |
from /usr/lib/nvidia/libnvidia-glcore.so.340.106 | |
No symbol table info available. | |
#2 0x00007ffff42eb094 in ?? () | |
from /usr/lib/nvidia/libnvidia-glcore.so.340.106 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
function ResourceHealthGatherer() {} | |
ResourceHealthGatherer.prototype.Schema = | |
"<a:help>Lets the unit gather resources from entities that have the ResourceSupply component.</a:help>" + | |
"<a:example>" + | |
"<MaxDistance>2.0</MaxDistance>" + | |
"<BaseSpeed>1.0</BaseSpeed>" + | |
"<Rates>" + | |
"<food.fish>1</food.fish>" + | |
"<metal.ore>3</metal.ore>" + |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/glew/CMakeLists.txt b/lib/glew/CMakeLists.txt | |
index a6d2c9a..ebe8edb 100644 | |
--- a/lib/glew/CMakeLists.txt | |
+++ b/lib/glew/CMakeLists.txt | |
@@ -7,6 +7,9 @@ if(APPLE) | |
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i386 -F/Library/Frameworks") | |
endif() | |
+find_package(OpenGL REQUIRED) | |
+include_directories(${OPENGL_INCLUDE_DIR}) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: source/simulation2/components/CCmpFootprint.cpp | |
=================================================================== | |
--- source/simulation2/components/CCmpFootprint.cpp (revision 16013) | |
+++ source/simulation2/components/CCmpFootprint.cpp (working copy) | |
@@ -59,15 +59,15 @@ | |
"<choice>" | |
"<element name='Square' a:help='Set the footprint to a square of the given size'>" | |
"<attribute name='width' a:help='Size of the footprint along the left/right direction (in metres)'>" | |
- "<ref name='positiveDecimal'/>" | |
+ "<ref name='positiveDecimalAttribute'/>" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_a.xml b/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_a.xml | |
index 743ada5..77c0c44 100644 | |
--- a/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_a.xml | |
+++ b/binaries/data/mods/public/simulation/templates/units/rome_infantry_swordsman_a.xml | |
@@ -7,7 +7,7 @@ | |
</Armour> | |
<Attack> | |
<Melee> | |
- <Hack>14</Hack> | |
+ <Hack method="add">14.0</Hack> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: build/premake/extern_libs4.lua | |
=================================================================== | |
--- build/premake/extern_libs4.lua (revision 15776) | |
+++ build/premake/extern_libs4.lua (working copy) | |
@@ -235,7 +235,8 @@ | |
-- Suppress all the Boost warnings on OS X by including it as a system directory | |
buildoptions { "-isystem../" .. libraries_dir .. "boost/include" } | |
end | |
- if os.getversion().description == "OpenBSD" then | |
+ -- TODO This actually applies to most libraries we use on BSDs, make this a global setting. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: build/premake/extern_libs4.lua | |
=================================================================== | |
--- build/premake/extern_libs4.lua (revision 15764) | |
+++ build/premake/extern_libs4.lua (working copy) | |
@@ -235,7 +235,8 @@ | |
-- Suppress all the Boost warnings on OS X by including it as a system directory | |
buildoptions { "-isystem../" .. libraries_dir .. "boost/include" } | |
end | |
- if os.getversion().description == "OpenBSD" then | |
+-- if os.getversion().description == "OpenBSD" then |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
start {"settings":{"PlayerData":[{"Name":"Player 1","AI":"","AIDiff":2,"Civ":"mace","Team":-1},{"Name":"Player 2","AI":"","AIDiff":2,"Civ":"brit","Team":-1}],"Seed":32294,"CheatsEnabled":true,"CircularMap":true,"Description":"Each player starts the match atop a large flat plateau, otherwise known as an acropolis.\n\nTo the East lies a large bay with fishing opportunities. To the West is a rugged hinterland with an unclaimed acropolis commanding the valley below.","GameType":"conquest","Keywords":[],"LockTeams":false,"Name":"Acropolis Bay (2)","Preview":"acropolis_bay.png","RevealMap":false,"VictoryScripts":["scripts/Conquest.js"],"PopulationCap":300,"StartingResources":300,"Size":128,"TriggerScripts":["scripts/Conquest.js"],"mapType":"skirmish"},"mapFilter":"default","map":"maps/skirmishes/Acropolis Bay (2)","mapType":"skirmish","mapPath":"maps/skirmishes/","matchID":"D7CAEAEF5CE2582D","gameSpeed":1} | |
turn 0 200 | |
end | |
turn 1 200 | |
end | |
turn 2 200 | |
end | |
turn 3 200 | |
end | |
turn 4 200 |
NewerOlder