[aseprite] 305/308: Delete all unused patches.
Tobias Hansen
thansen at moszumanska.debian.org
Tue Mar 8 02:45:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository aseprite.
commit 51694827c5ef7b9fc848ccb77fb7dbdb2773118f
Author: Tobias Hansen <thansen at localhost.localdomain>
Date: Tue Mar 8 02:27:20 2016 +0000
Delete all unused patches.
---
debian/patches/define-O_BINARY.patch | 19 ----
debian/patches/disable-file-and-gif-tests.patch | 19 ----
debian/patches/disable-resize_image_tests.patch | 22 ----
debian/patches/find_libpixman.patch | 23 ----
debian/patches/giflib-4.1.6.patch | 113 -------------------
debian/patches/libpng16.patch | 11 --
debian/patches/resizing_from_options_gui.patch | 141 ------------------------
7 files changed, 348 deletions(-)
diff --git a/debian/patches/define-O_BINARY.patch b/debian/patches/define-O_BINARY.patch
deleted file mode 100644
index 279fac1..0000000
--- a/debian/patches/define-O_BINARY.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Define O_BINARY and O_TEXT on Unix.
- These have no meaning on Unix and are not defined.
- The same definitions as here are done in the
- Allegro header alucfg.h.
-Author: Tobias Hansen <thansen at debian.org>
-
---- a/src/base/file_handle.cpp
-+++ b/src/base/file_handle.cpp
-@@ -19,6 +19,10 @@
- #include <sys/stat.h>
- #else
- #include <fcntl.h>
-+#ifndef O_BINARY
-+#define O_BINARY 0
-+#define O_TEXT 0
-+#endif
- #endif
-
- using namespace std;
diff --git a/debian/patches/disable-file-and-gif-tests.patch b/debian/patches/disable-file-and-gif-tests.patch
deleted file mode 100644
index 80eecab..0000000
--- a/debian/patches/disable-file-and-gif-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Disable the file and gif tests
- These unit tests segfault when invoked by debuild or in a chroot, but not
- with dpkg-buildpackage -rfakeroot or debian/rules override_dh_auto_test.
- I may investigate this later.
-Author: Tobias Hansen <thansen at debian.org>
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -203,7 +203,9 @@
-
- string(REGEX MATCH "_ui_tests" test_requires_ui ${testname})
- if (NOT test_requires_ui STREQUAL "_ui_tests")
-- set(local_non_ui_runs ${local_non_ui_runs} run_${testname})
-+ if (NOT (${testname} STREQUAL "file_tests" OR ${testname} STREQUAL "gif_tests"))
-+ set(local_non_ui_runs ${local_non_ui_runs} run_${testname})
-+ endif()
- endif()
- endforeach()
- set(all_runs ${all_runs} ${local_runs} PARENT_SCOPE)
diff --git a/debian/patches/disable-resize_image_tests.patch b/debian/patches/disable-resize_image_tests.patch
deleted file mode 100644
index 914f86f..0000000
--- a/debian/patches/disable-resize_image_tests.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Disable the resize image tests
- This file currently contains only a test for the neirest neighbor
- resize algorithm, which has a bug which makes it non-deterministic.
- This caused the test to fail on i386 architectures. It will be disabled
- until the algorithm is fixed.
-Author: Tobias Hansen <thansen at debian.org>
-Bug: https://github.com/aseprite/aseprite/issues/502
-Bug-Debian: https://bugs.debian.org/765291
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -204,8 +204,10 @@
- string(REGEX MATCH "_ui_tests" test_requires_ui ${testname})
- if (NOT test_requires_ui STREQUAL "_ui_tests")
- if (NOT (${testname} STREQUAL "file_tests" OR ${testname} STREQUAL "gif_tests"))
-+ if (NOT (${testname} STREQUAL "resize_image_tests"))
- set(local_non_ui_runs ${local_non_ui_runs} run_${testname})
- endif()
-+ endif()
- endif()
- endforeach()
- set(all_runs ${all_runs} ${local_runs} PARENT_SCOPE)
diff --git a/debian/patches/find_libpixman.patch b/debian/patches/find_libpixman.patch
deleted file mode 100644
index e90043e..0000000
--- a/debian/patches/find_libpixman.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Find libpixman using pkg-config
-Author: Tobias Hansen <thansen at debian.org>
-
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -120,11 +120,12 @@
- endif()
-
- if(USE_SHARED_PIXMAN)
-- find_library(LIBPIXMAN_LIBRARY NAMES pixman)
-- find_path(LIBPIXMAN_INCLUDE_DIR NAMES pixman.h)
--
-- set(libs3rdparty ${libs3rdparty} ${LIBPIXMAN_LIBRARY})
-- include_directories(${LIBPIXMAN_INCLUDE_DIR})
-+ find_package(PkgConfig)
-+ pkg_check_modules(PIXMAN pixman-1)
-+ if(PIXMAN_FOUND)
-+ set(libs3rdparty ${libs3rdparty} ${PIXMAN_LIBRARIES})
-+ include_directories(${PIXMAN_INCLUDE_DIRS})
-+ endif(PIXMAN_FOUND)
- else()
- set(libs3rdparty ${libs3rdparty} pixman)
- include_directories(${PIXMAN_DIR}/pixman)
diff --git a/debian/patches/giflib-4.1.6.patch b/debian/patches/giflib-4.1.6.patch
deleted file mode 100644
index dbcc7b3..0000000
--- a/debian/patches/giflib-4.1.6.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Description: Build against gitlib 4.1.6.
- Upstream changed to gitlib 5.1.0 in commit
- df3b87c409c09c25233991af33b74bdefeeeb7e7
- This is mostly the reverse of the part of that
- commit that changed gif_format.cpp.
-Author: Tobias Hansen <thansen at debian.org>
-
---- a/src/app/file/gif_format.cpp
-+++ b/src/app/file/gif_format.cpp
-@@ -113,36 +113,11 @@
- static int interlaced_offset[] = { 0, 4, 2, 1 };
- static int interlaced_jumps[] = { 8, 8, 4, 2 };
-
--struct GifFilePtr {
--public:
-- typedef int (*CloseFunc)(GifFileType*, int*);
--
-- GifFilePtr(GifFileType* ptr, CloseFunc closeFunc) :
-- m_ptr(ptr), m_closeFunc(closeFunc) {
-- }
--
-- ~GifFilePtr() {
-- int errCode;
-- m_closeFunc(m_ptr, &errCode);
-- }
--
-- operator GifFileType*() {
-- return m_ptr;
-- }
--
-- GifFileType* operator->() {
-- return m_ptr;
-- }
--
--private:
-- GifFileType* m_ptr;
-- CloseFunc m_closeFunc;
--};
--
- bool GifFormat::onLoad(FileOp* fop)
- {
-- int errCode;
-- GifFilePtr gif_file(DGifOpenFileHandle(open_file_descriptor_with_exception(fop->filename, "rb"), &errCode), &DGifCloseFile);
-+ UniquePtr<GifFileType, int(*)(GifFileType*)> gif_file
-+ (DGifOpenFileHandle(open_file_descriptor_with_exception(fop->filename, "rb")),
-+ DGifCloseFile);
-
- if (!gif_file) {
- fop_error(fop, "Error loading GIF header.\n");
-@@ -253,7 +228,7 @@
- for (int y = 0; y < frame_h; ++y) {
- addr = frame_image->getPixelAddress(0, y);
- if (DGifGetLine(gif_file, addr, frame_w) == GIF_ERROR)
-- throw Exception("Invalid image data (%d).\n", gif_file->Error);
-+ throw Exception("Invalid image data (%d).\n", GifLastError());
- }
- }
-
-@@ -532,8 +507,9 @@
- #ifdef ENABLE_SAVE
- bool GifFormat::onSave(FileOp* fop)
- {
-- int errCode;
-- GifFilePtr gif_file(EGifOpenFileHandle(open_file_descriptor_with_exception(fop->filename, "wb"), &errCode), &EGifCloseFile);
-+ UniquePtr<GifFileType, int(*)(GifFileType*)> gif_file
-+ (EGifOpenFileHandle(open_file_descriptor_with_exception(fop->filename, "wb")),
-+ EGifCloseFile);
-
- if (!gif_file)
- throw Exception("Error creating GIF file.\n");
-@@ -568,7 +544,7 @@
-
- // We use a global color map only if this is a transparent GIF
- if (!has_background) {
-- color_map = GifMakeMapObject(color_map_size, NULL);
-+ color_map = MakeMapObject(color_map_size, NULL);
- if (color_map == NULL)
- throw std::bad_alloc();
-
-@@ -689,21 +665,18 @@
-
- // Specify loop extension.
- if (frame_num == 0 && loop >= 0) {
-- if (EGifPutExtensionLeader(gif_file, APPLICATION_EXT_FUNC_CODE) == GIF_ERROR)
-- throw Exception("Error writing GIF graphics extension record (header section).");
--
- unsigned char extension_bytes[11];
- memcpy(extension_bytes, "NETSCAPE2.0", 11);
-- if (EGifPutExtensionBlock(gif_file, 11, extension_bytes) == GIF_ERROR)
-+ if (EGifPutExtensionFirst(gif_file, APPLICATION_EXT_FUNC_CODE, 11, extension_bytes) == GIF_ERROR)
- throw Exception("Error writing GIF graphics extension record (first block).");
-
- extension_bytes[0] = 1;
- extension_bytes[1] = (loop & 0xff);
- extension_bytes[2] = (loop >> 8) & 0xff;
-- if (EGifPutExtensionBlock(gif_file, 3, extension_bytes) == GIF_ERROR)
-+ if (EGifPutExtensionNext(gif_file, APPLICATION_EXT_FUNC_CODE, 3, extension_bytes) == GIF_ERROR)
- throw Exception("Error writing GIF graphics extension record (second block).");
-
-- if (EGifPutExtensionTrailer(gif_file) == GIF_ERROR)
-+ if (EGifPutExtensionLast(gif_file, APPLICATION_EXT_FUNC_CODE, 0, NULL) == GIF_ERROR)
- throw Exception("Error writing GIF graphics extension record (trailer section).");
- }
-
-@@ -729,7 +702,7 @@
- if ((!color_map && frame_num == 0) ||
- (current_palette.countDiff(&previous_palette, NULL, NULL) > 0)) {
- if (!image_color_map) {
-- image_color_map = GifMakeMapObject(current_palette.size(), NULL);
-+ image_color_map = MakeMapObject(current_palette.size(), NULL);
- if (image_color_map == NULL)
- throw std::bad_alloc();
- }
diff --git a/debian/patches/libpng16.patch b/debian/patches/libpng16.patch
deleted file mode 100644
index b28e5e8..0000000
--- a/debian/patches/libpng16.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/app/file/png_format.cpp
-+++ b/src/app/file/png_format.cpp
-@@ -413,7 +413,7 @@
- #endif
-
- // Save the color palette.
-- palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH * png_sizeof(png_color));
-+ palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH * sizeof(png_color));
- for (c = 0; c < PNG_MAX_PALETTE_LENGTH; c++) {
- fop_sequence_get_color(fop, c, &r, &g, &b);
- palette[c].red = r;
diff --git a/debian/patches/resizing_from_options_gui.patch b/debian/patches/resizing_from_options_gui.patch
deleted file mode 100644
index 2599286..0000000
--- a/debian/patches/resizing_from_options_gui.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Description: Add window resizing to options dialog
- This patch adds window resizing to the options dialog.
- This is useful because this version of Aseprite lacks
- the ability to resize windows by dragging the window border.
- Aseprite upstream uses a patched version of Allegro to
- provide this feature.
-Author: Tobias Hansen <thansen at debian.org>
-Forwarded: not-needed
-
---- a/data/widgets/options.xml
-+++ b/data/widgets/options.xml
-@@ -17,10 +17,14 @@
- <panel id="panel">
- <vbox id="section_general">
- <separator text="General" horizontal="true" />
-- <hbox>
-+ <grid columns="2">
-+ <label text="Window Width:" />
-+ <entry id="window_width" maxsize="4" />
-+ <label text="Window Height:" />
-+ <entry id="window_height" maxsize="4" />
- <label text="Screen Scale:" />
- <combobox id="screen_scale" />
-- </hbox>
-+ </grid>
- <check text="Show timeline automatically" id="autotimeline" tooltip="Show the timeline automatically
when a new frame or layer is added." />
- <check text="Expand menu bar items on mouseover" id="expand_menubar_on_mouseover" tooltip="Check this option to get
this old menus behavior." />
- <check text="Center editor when zoom with keys or zoom tool" id="center_on_zoom" />
---- a/src/app/commands/cmd_options.cpp
-+++ b/src/app/commands/cmd_options.cpp
-@@ -90,6 +90,9 @@
- if (m_settings->getShowSpriteEditorScrollbars())
- showScrollbars()->setSelected(true);
-
-+ windowWidth()->setTextf("%d", get_window_width());
-+ windowHeight()->setTextf("%d", get_window_height());
-+
- // Checked background size
- screenScale()->addItem("1:1");
- screenScale()->addItem("2:1");
-@@ -180,11 +183,36 @@
- m_settings->experimental()->setFlashLayer(flashLayer()->isSelected());
-
- int new_screen_scaling = screenScale()->getSelectedItemIndex()+1;
-+
-+ int window_width_value;
-+ window_width_value = windowWidth()->getTextInt();
-+ window_width_value = MID(280*new_screen_scaling, window_width_value, 9999);
-+
-+ int window_height_value;
-+ window_height_value = windowHeight()->getTextInt();
-+ window_height_value = MID(220*new_screen_scaling, window_height_value, 9999);
-+
-+ bool warn_restart = false;
-+
-+ if (window_width_value != get_window_width()) {
-+ set_window_width(window_width_value);
-+ warn_restart = true;
-+ }
-+
-+ if (window_height_value != get_window_height()) {
-+ set_window_height(window_height_value);
-+ warn_restart = true;
-+ }
-+
- if (new_screen_scaling != get_screen_scaling()) {
- set_screen_scaling(new_screen_scaling);
-+ warn_restart = true;
-+ }
-
-+ if (warn_restart) {
- ui::Alert::show(PACKAGE
-- "<<You must restart the program to see your changes to 'Screen Scale' setting."
-+ "<<You must restart the program to see your changes to"
-+ "<<'Window Width', 'Window Height' or 'Screen Scale' setting."
- "||&OK");
- }
-
---- a/src/app/modules/gui.cpp
-+++ b/src/app/modules/gui.cpp
-@@ -204,13 +204,43 @@
- she::Display* display = Manager::getDefault()->getDisplay();
- if (display) {
- set_config_bool("GfxMode", "Maximized", display->isMaximized());
-- set_config_int("GfxMode", "Width", display->originalWidth());
-- set_config_int("GfxMode", "Height", display->originalHeight());
-+ set_config_int("GfxMode", "Width", get_window_width());
-+ set_config_int("GfxMode", "Height", get_window_height());
- set_config_int("GfxMode", "Depth", bitmap_color_depth(screen));
- }
- set_config_int("GfxMode", "ScreenScale", screen_scaling);
- }
-
-+int get_window_width()
-+{
-+ int fallback = 1024;
-+ she::Display* display = Manager::getDefault()->getDisplay();
-+ if (display) {
-+ fallback = display->originalWidth();
-+ }
-+ return get_config_int("GfxMode", "Width", fallback);
-+}
-+
-+void set_window_width(int width)
-+{
-+ set_config_int("GfxMode", "Width", width);
-+}
-+
-+int get_window_height()
-+{
-+ int fallback = 768;
-+ she::Display* display = Manager::getDefault()->getDisplay();
-+ if (display) {
-+ fallback = display->originalHeight();
-+ }
-+ return get_config_int("GfxMode", "Height", fallback);
-+}
-+
-+void set_window_height(int height)
-+{
-+ set_config_int("GfxMode", "Height", height);
-+}
-+
- int get_screen_scaling()
- {
- return screen_scaling;
---- a/src/app/modules/gui.h
-+++ b/src/app/modules/gui.h
-@@ -45,6 +45,12 @@
- int init_module_gui();
- void exit_module_gui();
-
-+ int get_window_width();
-+ void set_window_width(int width);
-+
-+ int get_window_height();
-+ void set_window_height(int height);
-+
- int get_screen_scaling();
- void set_screen_scaling(int scaling);
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git
More information about the Pkg-games-commits
mailing list