This is an automated email from the git hooks/post-receive script. emorrp1-guest pushed a commit to branch master in repository corsix-th.
commit 3cce65b3069c8632cd02a88cb1030f9b6167a379 Author: Phil Morrell <[email protected]> Date: Fri Nov 17 09:46:22 2017 +0000 drop patches released upstream * refresh default_config --- debian/patches/default_config.patch | 6 ++-- debian/patches/editor_drag_performance.patch | 52 ---------------------------- debian/patches/include_campaigns.patch | 23 ------------ debian/patches/series | 2 -- 4 files changed, 3 insertions(+), 80 deletions(-) diff --git a/debian/patches/default_config.patch b/debian/patches/default_config.patch index 48b5e6e..db2fa81 100644 --- a/debian/patches/default_config.patch +++ b/debian/patches/default_config.patch @@ -7,7 +7,7 @@ check_for_update enabled by default is a privacy breach. --- a/CorsixTH/Lua/config_finder.lua +++ b/CorsixTH/Lua/config_finder.lua -@@ -119,7 +119,7 @@ +@@ -120,7 +120,7 @@ audio_frequency = 22050, audio_channels = 2, audio_buffer_size = 2048, @@ -16,12 +16,12 @@ check_for_update enabled by default is a privacy breach. debug = false, DBGp_client_idehost = nil, DBGp_client_ideport = nil, -@@ -133,7 +133,7 @@ +@@ -134,7 +134,7 @@ shift_scroll_speed = 4, new_graphics_folder = nil, use_new_graphics = false, - check_for_updates = true + check_for_updates = false } - local fi = io.open(config_filename, "r") + fi = io.open(config_filename, "r") local config_values = {} diff --git a/debian/patches/editor_drag_performance.patch b/debian/patches/editor_drag_performance.patch deleted file mode 100644 index e3d6c03..0000000 --- a/debian/patches/editor_drag_performance.patch +++ /dev/null @@ -1,52 +0,0 @@ -Subject: [PATCH] Fix performance issue with drag draw in mapper -From: "Stephen E. Baker" <[email protected]> -Bug: https://github.com/CorsixTH/CorsixTH/issues/1084 -Origin: upstream, commit:da8b5d76 -Reviewed-by: Phil Morrell <[email protected]> -Last-Update: 2016-06-22 - -Scale once for the entire drag area instead of once per tile. Greatly -improves performance. ---- - CorsixTH/Lua/dialogs/resizables/map_editor.lua | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/CorsixTH/Lua/dialogs/resizables/map_editor.lua b/CorsixTH/Lua/dialogs/resizables/map_editor.lua -index 6e52248..1a18a7a 100644 ---- a/CorsixTH/Lua/dialogs/resizables/map_editor.lua -+++ b/CorsixTH/Lua/dialogs/resizables/map_editor.lua -@@ -850,8 +850,7 @@ end - --!param ysize (int) Vertical size in tiles. - function UIMapEditor:fillCursorArea(canvas, xpos, ypos, xsize, ysize) - local ui = self.ui -- local zoom = self.ui.zoom_factor -- local scaled = canvas:scale(zoom) -+ local zoom = ui.zoom_factor - - for x = 0, xsize - 1 do - for y = 0, ysize - 1 do -@@ -859,9 +858,6 @@ function UIMapEditor:fillCursorArea(canvas, xpos, ypos, xsize, ysize) - self.cell_outline:draw(canvas, 2, math.floor(xcoord / zoom) - 32, math.floor(ycoord / zoom)) - end - end -- if scaled then -- canvas:scale(1) -- end - end - - --! Draw the display (map editor window, and main world display) -@@ -886,10 +882,14 @@ function UIMapEditor:draw(canvas, ...) - xsize, ysize = self.cursor.sprite.xsize, self.cursor.sprite.ysize - end - -- Draw cursors. -+ local scaled = canvas:scale(ui.zoom_factor) - for _, coord in ipairs(coords) do - local xpos, ypos = coord.xpos, coord.ypos - self:fillCursorArea(canvas, xpos, ypos, xsize, ysize) - end -+ if scaled then -+ canvas:scale(1) -+ end - end - - UIResizable.draw(self, canvas, ...) diff --git a/debian/patches/include_campaigns.patch b/debian/patches/include_campaigns.patch deleted file mode 100644 index d89fd8f..0000000 --- a/debian/patches/include_campaigns.patch +++ /dev/null @@ -1,23 +0,0 @@ -Subject: [PATCH] Include Campaigns directory in CMake build -Author: "Phil Morrell" <[email protected]> -Bug: https://github.com/CorsixTH/CorsixTH/issues/1098 -Origin: upstream, commit:6653d41a -Last-Update: 2016-06-22 - ---- - CorsixTH/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CorsixTH/CMakeLists.txt b/CorsixTH/CMakeLists.txt -index 565fd9a..ef52250 100644 ---- a/CorsixTH/CMakeLists.txt -+++ b/CorsixTH/CMakeLists.txt -@@ -209,7 +209,7 @@ IF(APPLE) - ") - ELSE() - install(TARGETS CorsixTH RUNTIME DESTINATION CorsixTH) -- install(DIRECTORY Lua Levels DESTINATION CorsixTH PATTERN "*.svn" EXCLUDE) -+ install(DIRECTORY Campaigns Lua Levels DESTINATION CorsixTH PATTERN "*.svn" EXCLUDE) - install(DIRECTORY Bitmap DESTINATION CorsixTH - FILES_MATCHING REGEX ".*\\.(tab|pal|dat|png)$" - PATTERN "*.svn" EXCLUDE) diff --git a/debian/patches/series b/debian/patches/series index 0c4d27a..e0a6f1e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ default_config.patch -include_campaigns.patch -editor_drag_performance.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/corsix-th.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
