commit: 1e97075934c5241362b48cae77ebf7a5f964b143 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Dec 24 08:56:31 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Dec 24 14:48:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e970759
dev-games/aseprite: drop 1.1.9 Closes: https://bugs.gentoo.org/886897 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-games/aseprite/Manifest | 1 - dev-games/aseprite/aseprite-1.1.9.ebuild | 113 --------------------- .../files/aseprite-1.1.7_type-punned_pointer.patch | 28 ----- dev-games/aseprite/metadata.xml | 4 - 4 files changed, 146 deletions(-) diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest index e8732fd20ba9..3a17ddaab2ba 100644 --- a/dev-games/aseprite/Manifest +++ b/dev-games/aseprite/Manifest @@ -1,3 +1,2 @@ -DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e DIST Aseprite-v1.2.40-Source.zip 61802371 BLAKE2B f6f586a3ca222de208e6639e3fc94a63f98e487e1975dccd2974ffa71f937384177639e3799fb81f064afaf1c4a048394fab32a30bcda353320ac55c38b17636 SHA512 0a548428a3362f49cb6cecaa061de8371ad3f0bc22d00bc957e21f22316772e854d7ad36ebb7e5b69274eea376bb62fa39abfd4bc02250524c3707f81a628b1f DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.gh.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075 diff --git a/dev-games/aseprite/aseprite-1.1.9.ebuild b/dev-games/aseprite/aseprite-1.1.9.ebuild deleted file mode 100644 index 61608ae8db1d..000000000000 --- a/dev-games/aseprite/aseprite-1.1.9.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake desktop flag-o-matic xdg-utils - -DESCRIPTION="Animated sprite editor & pixel art tool" -HOMEPAGE="https://www.aseprite.org"; -SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip"; - -# See https://github.com/aseprite/aseprite#license -# Some bundled third-party packages built-in: -# gtest duktape modp_b64 simpleini -LICENSE="Aseprite-EULA" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="bundled-libs debug kde gtk3 test webp" -RESTRICT="bindist mirror !test? ( test )" - -RDEPEND=" - !bundled-libs? ( media-libs/allegro:0[X,png] ) - gtk3? ( dev-cpp/gtkmm:3.0 ) - kde? ( - dev-qt/qtcore:5 - kde-frameworks/kio:5 - ) - webp? ( media-libs/libwebp ) - dev-libs/tinyxml - media-libs/freetype - media-libs/giflib:= - media-libs/libpng:0= - net-misc/curl - sys-libs/zlib - virtual/jpeg:0 - x11-libs/libX11 - x11-libs/pixman" -BDEPEND=" - app-arch/unzip - gtk3? ( virtual/pkgconfig ) - webp? ( virtual/pkgconfig )" - -DOCS=( docs/files/ase.txt - docs/files/fli.txt - docs/files/msk.txt - docs/files/pic.txt - docs/files/picpro.txt - README.md ) - -S="${WORKDIR}" - -PATCHES=( "${FILESDIR}/${PN}-1.1.7_type-punned_pointer.patch" ) - -src_prepare() { - cmake_src_prepare - - # Fix to make flag-o-matic work. - if use debug ; then - sed -i '/-DNDEBUG/d' CMakeLists.txt || die - fi - # Fix shebang in thumbnailer - sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' desktop/aseprite-thumbnailer || die -} - -src_configure() { - use debug && append-cppflags -DDEBUGMODE -D_DEBUG - - local mycmakeargs=( - -DENABLE_UPDATER=OFF - -DFULLSCREEN_PLATFORM=ON - -DUSE_SHARED_ALLEGRO4=$(usex !bundled-libs) - -DUSE_SHARED_CURL=ON - -DUSE_SHARED_FREETYPE=ON - -DUSE_SHARED_GIFLIB=ON - -DUSE_SHARED_JPEGLIB=ON - -DUSE_SHARED_LIBLOADPNG=$(usex !bundled-libs) - -DUSE_SHARED_LIBPNG=ON - -DUSE_SHARED_PIXMAN=ON - -DUSE_SHARED_TINYXML=ON - -DUSE_SHARED_ZLIB=ON - -DUSE_SHARED_LIBWEBP=ON - -DWITH_DESKTOP_INTEGRATION=ON - -DWITH_GTK_FILE_DIALOG_SUPPORT="$(usex gtk3)" - -DWITH_QT_THUMBNAILER="$(usex kde)" - -DWITH_WEBP_SUPPORT="$(usex webp)" - -DENABLE_TESTS="$(usex test)" - -DKDE_INSTALL_USE_QT_SYS_PATHS=ON - ) - cmake_src_configure -} - -src_install() { - newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png" - cmake_src_install -} - -pkg_postinst() { - if use !bundled-libs ; then - ewarn "Aseprite has been built with system-wide Allegro 4." - ewarn "Please note that you will not be able to resize the main window." - ewarn "For resizing support enable USE-flag bundled-libs and rebuild package." - fi - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} diff --git a/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch b/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch deleted file mode 100644 index ca0921437fc8..000000000000 --- a/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/src/allegro/src/x/xkeyboard.c b/src/allegro/src/x/xkeyboard.c -index f121e62..86fa4f7 100644 ---- a/src/allegro/src/x/xkeyboard.c -+++ b/src/allegro/src/x/xkeyboard.c -@@ -356,6 +356,14 @@ static int find_unknown_key_assignment (int i) - return _xwin.keycode_to_scancode[i]; - } - -+/* unicode_getc: -+ * Reads a character from a Unicode string. -+ */ -+static int unicode_getc(AL_CONST char *s) -+{ -+ return *((unsigned short *)s); -+} -+ - - - /* _xwin_keyboard_handler: -@@ -412,7 +420,7 @@ void _xwin_keyboard_handler(XKeyEvent *event, int dga2_hack) - } - buffer[len] = '\0'; - uconvert(buffer, U_UTF8, buffer2, U_UNICODE, sizeof buffer2); -- unicode = *(unsigned short *)buffer2; -+ unicode = unicode_getc(buffer2); - - #ifdef ALLEGRO_XWINDOWS_WITH_XIM - r = XFilterEvent((XEvent *)event, _xwin.window); diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml index 6a0f95b9f0be..66ff5b77ea41 100644 --- a/dev-games/aseprite/metadata.xml +++ b/dev-games/aseprite/metadata.xml @@ -9,10 +9,6 @@ <email>[email protected]</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="bundled-libs">Use the upstream provided bundled version of allegro 4.4.2</flag> - <flag name="gtk3">Enable support for the experimental native GTK File Dialog</flag> - </use> <upstream> <remote-id type="github">aseprite/aseprite</remote-id> </upstream>
