* [gentoo-commits] repo/gentoo:master commit in: dev-games/aseprite/, dev-games/aseprite/files/
@ 2016-04-23 7:08 Patrice Clement
0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-04-23 7:08 UTC (permalink / raw
To: gentoo-commits
commit: 3030480e2db22740e35db98c2c5d293b23cfb68a
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri Apr 22 09:37:31 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 06:53:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3030480e
dev-games/aseprite: Correct patch for 1.1.4.1
Added subslot checks for libpng and libgif.
Package-Manager: portage-2.2.26
Gentoo-Bug: https://bugs.gentoo.org/580802
Closes: https://github.com/gentoo/gentoo/pull/1322
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-games/aseprite/aseprite-1.1.4.1.ebuild | 4 +--
.../files/aseprite-1.1.4.1_underlinking.patch | 32 ++++++++++++++++------
2 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/dev-games/aseprite/aseprite-1.1.4.1.ebuild b/dev-games/aseprite/aseprite-1.1.4.1.ebuild
index f89be11..075510a 100644
--- a/dev-games/aseprite/aseprite-1.1.4.1.ebuild
+++ b/dev-games/aseprite/aseprite-1.1.4.1.ebuild
@@ -22,9 +22,9 @@ IUSE="debug test webp"
RDEPEND="dev-libs/tinyxml
media-libs/allegro:0[X,png]
media-libs/freetype
- media-libs/giflib
+ media-libs/giflib:=
webp? ( media-libs/libwebp )
- media-libs/libpng:0
+ media-libs/libpng:0=
net-misc/curl
sys-libs/zlib
virtual/jpeg:0
diff --git a/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch b/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
index 4240040..8481657 100644
--- a/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
+++ b/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
@@ -1,12 +1,28 @@
+From e7883b7d6428662077fa88c8dfa4e0fdee28ff46 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Fri, 22 Apr 2016 13:42:26 +0500
+Subject: [PATCH] Fixing underlinking for gcc 4.9
+
+Allegro4 backend uses XGrabPointer() from libX11.
+Added ${X11_LIBRARIES} for she to resolve underlinking.
+---
+ src/she/CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
-index eddf386..d1b8ce5 100644
+index cddf5bc..1841aa6 100644
--- a/src/she/CMakeLists.txt
+++ b/src/she/CMakeLists.txt
-@@ -205,6 +205,7 @@ endif()
- add_library(she ${SHE_SOURCES})
-
- target_link_libraries(she
-+ ${PLATFORM_LIBS}
- gfx-lib
- base-lib)
+@@ -242,7 +242,8 @@ if(USE_ALLEG4_BACKEND)
+ target_link_libraries(she
+ ${LOADPNG_LIBRARY}
+ ${LIBALLEGRO4_LINK_FLAGS}
+- ${DXGUID_LIBRARIES})
++ ${DXGUID_LIBRARIES}
++ ${X11_LIBRARIES})
+ endif()
+ if(USE_SKIA_BACKEND)
+--
+2.7.3
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/aseprite/, dev-games/aseprite/files/
@ 2016-09-14 11:19 Patrice Clement
0 siblings, 0 replies; 4+ messages in thread
From: Patrice Clement @ 2016-09-14 11:19 UTC (permalink / raw
To: gentoo-commits
commit: c03d1e966a8455897002f7ab108877564af28947
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Sep 6 18:20:11 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 11:18:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03d1e96
dev-games/aseprite: version bump to 1.1.7.
Added bundled allegro library support for resizing feature.
Gentoo-Bug: https://bugs.gentoo.org/588832
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/2142
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-games/aseprite/Manifest | 1 +
dev-games/aseprite/aseprite-1.1.7.ebuild | 102 +++++++++++++++++++++
.../files/aseprite-1.1.7_type-punned_pointer.patch | 28 ++++++
dev-games/aseprite/metadata.xml | 1 +
4 files changed, 132 insertions(+)
diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest
index 5bdeed5..095a276 100644
--- a/dev-games/aseprite/Manifest
+++ b/dev-games/aseprite/Manifest
@@ -1,3 +1,4 @@
DIST Aseprite-v1.1.4.1-Source.zip 11723085 SHA256 731ac44259217626dde91cdcae9a24cdd4337540fc91bbe5c05cebcb12869879 SHA512 deeb42c123517e17378498584bb788f375e8aaaf046d5f9732848a5bd794a1af1d8381ff51271f9e30c198478e0f716ae23495972b693db9049ff4c2b8968672 WHIRLPOOL 5c2bd1bf8f5d187c385086a431ab070f55308b01089ce703e54093963402a9300295ea1cbf3602021fea1211ae68c6a2a07391e8e054827ce82ee60462001c4a
DIST Aseprite-v1.1.6-Source.zip 11801981 SHA256 259c6418d5bc48a04f63a27f4a8c5a0aa44ce759403ba976ebbfad293eab08e8 SHA512 d87bcc5ece64cbc772ea5d4dc1edf29943d9038221905c0263511852afbb4e9119ce82468502a78c286729bb91389d08e3a8b7f358e4f6f8fe88507e7e69c9ac WHIRLPOOL 8f9168551be29d8c453fc1db27930a87e8228081b837c8c1a608045acdb7968715a8eb3994e04df83288f1fb12c5744f2bbb6c0733e578dd20bc4c4a2a234801
+DIST Aseprite-v1.1.7-Source.zip 11801711 SHA256 7b5b42d301fc37d3b62a50432a0fbff1483857b8f1829bb6fdac3b1a22d19ade SHA512 9a92853042c7de567a7eb33d10ddd38c6d6bd53acfe4b93dc96e11408a7bda39ef7503c159934c483f0455700933c541dfdc0cb4c505d3385778e40686e474e6 WHIRLPOOL 09097fe4784395370c7d8e1af7ee921943e0798c8e0853fdc6491f2daa0e80e1cf6e637041972a05abcfe687581ab1d2d72f99696def6ddbd69e2b8c1220db5e
DIST aseprite-0.9.5.tar.xz 507744 SHA256 81e0360d9d8a32d6c548775dbacdb1520aac94b54c2d9f1327d52f219737f154 SHA512 fc6df942aefea67fd05e1b688209b70a2d5879a1441f61a6e3ee4d72fcdab4e580e1d4d7392fd493e0a46c45401a3eef759aa3efee17450e4c98df7f310b2d00 WHIRLPOOL 060dcf2754827ab3b30dde55cfcecd25e2d88f6e296b45529737e2194f4a9891d171776d10f9c571890efb9766b64080b85dc3d737102d2ac7be9843d27fdaef
diff --git a/dev-games/aseprite/aseprite-1.1.7.ebuild b/dev-games/aseprite/aseprite-1.1.7.ebuild
new file mode 100644
index 00000000..418b6cd
--- /dev/null
+++ b/dev-games/aseprite/aseprite-1.1.7.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils eutils flag-o-matic
+
+DESCRIPTION="Animated sprite editor & pixel art tool"
+HOMEPAGE="http://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#credits
+# Some bundled third-party packages built-in:
+# gtest duktape modp_b64 simpleini
+LICENSE="BSD GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="bundled-libs debug kde gtk3 test webp"
+
+RDEPEND="dev-libs/tinyxml
+ !bundled-libs? ( media-libs/allegro:0[X,png] )
+ media-libs/freetype
+ media-libs/giflib:=
+ webp? ( media-libs/libwebp )
+ media-libs/libpng:0=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/jpeg:0
+ x11-libs/libX11
+ x11-libs/pixman
+ gtk3? ( dev-cpp/gtkmm:3.0 )
+ kde? (
+ dev-qt/qtcore:5
+ kde-frameworks/kio:5 )"
+DEPEND="${RDEPEND}
+ 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}/${P}_type-punned_pointer.patch" )
+
+src_prepare() {
+ cmake-utils_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=ON
+ -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-utils_src_configure
+}
+
+src_install() {
+ newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png"
+ cmake-utils_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
+}
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
new file mode 100644
index 00000000..ca09214
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.1.7_type-punned_pointer.patch
@@ -0,0 +1,28 @@
+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 dff8a1c..2e97a0b 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -14,6 +14,7 @@
Animated sprite editor and pixel art tool
</longdescription>
<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>
<flag name="memleak">Enable memory-leaks detector (only for developers)</flag>
<flag name="static">Link against static version of C and C++ runtimes</flag>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/aseprite/, dev-games/aseprite/files/
@ 2023-02-19 19:39 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-02-19 19:39 UTC (permalink / raw
To: gentoo-commits
commit: ffd82a99c93e2b2b111d15fdb96223c20369205f
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Feb 19 18:26:41 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 19 19:38:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd82a99
dev-games/aseprite: fix compilation on GCC-13
Closes: https://bugs.gentoo.org/895440
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29669
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-games/aseprite/aseprite-1.2.40.ebuild | 1 +
.../files/aseprite-1.2.40_ixwebsocket-gcc13.patch | 245 +++++++++++++++++++++
2 files changed, 246 insertions(+)
diff --git a/dev-games/aseprite/aseprite-1.2.40.ebuild b/dev-games/aseprite/aseprite-1.2.40.ebuild
index b475dc122883..ace0f6db885e 100644
--- a/dev-games/aseprite/aseprite-1.2.40.ebuild
+++ b/dev-games/aseprite/aseprite-1.2.40.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.2.40_shared_webp.patch"
"${FILESDIR}/${PN}-1.2.35_laf_fixes.patch"
"${FILESDIR}/${PN}-1.2.40_musl_pthreads.patch"
+ "${FILESDIR}/${PN}-1.2.40_ixwebsocket-gcc13.patch"
)
src_prepare() {
diff --git a/dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch b/dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch
new file mode 100644
index 000000000000..85ae6739beb8
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.2.40_ixwebsocket-gcc13.patch
@@ -0,0 +1,245 @@
+From a5d86afd43920d2401682ecd3ec6879a574845ea Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 19 Feb 2023 21:08:36 +0300
+Subject: [PATCH] Fix compilation on GCC-13
+
+GCC-13 changes internal cstdint includes, and now files that uses
+standart integer types should directly include cstdint header.
+
+See: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+See: https://github.com/machinezone/IXWebSocket/pull/443
+Bug: https://bugs.gentoo.org/865117
+Bug: https://bugs.gentoo.org/895440
+--- a/third_party/IXWebSocket/ixwebsocket/IXBench.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXBench.h
+@@ -6,7 +6,7 @@
+ #pragma once
+
+ #include <chrono>
+-#include <stdint.h>
++#include <cstdint>
+ #include <string>
+
+ namespace ix
+--- a/third_party/IXWebSocket/ixwebsocket/IXConnectionState.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXConnectionState.h
+@@ -7,9 +7,9 @@
+ #pragma once
+
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+-#include <stdint.h>
+ #include <string>
+
+ namespace ix
+--- a/third_party/IXWebSocket/ixwebsocket/IXDNSLookup.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXDNSLookup.h
+@@ -12,6 +12,7 @@
+
+ #include "IXCancellationRequest.h"
+ #include <atomic>
++#include <cstdint>
+ #include <memory>
+ #include <mutex>
+ #include <set>
+--- a/third_party/IXWebSocket/ixwebsocket/IXHttp.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXHttp.h
+@@ -9,6 +9,7 @@
+ #include "IXProgressCallback.h"
+ #include "IXWebSocketHttpHeaders.h"
+ #include <atomic>
++#include <cstdint>
+ #include <tuple>
+ #include <unordered_map>
+
+--- a/third_party/IXWebSocket/ixwebsocket/IXHttpClient.cpp
++++ b/third_party/IXWebSocket/ixwebsocket/IXHttpClient.cpp
+@@ -12,6 +12,7 @@
+ #include "IXUserAgent.h"
+ #include "IXWebSocketHttpHeaders.h"
+ #include <assert.h>
++#include <cstdint>
+ #include <cstring>
+ #include <iomanip>
+ #include <random>
+--- a/third_party/IXWebSocket/ixwebsocket/IXHttpServer.cpp
++++ b/third_party/IXWebSocket/ixwebsocket/IXHttpServer.cpp
+@@ -10,6 +10,7 @@
+ #include "IXNetSystem.h"
+ #include "IXSocketConnect.h"
+ #include "IXUserAgent.h"
++#include <cstdint>
+ #include <cstring>
+ #include <fstream>
+ #include <sstream>
+--- a/third_party/IXWebSocket/ixwebsocket/IXNetSystem.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXNetSystem.h
+@@ -6,6 +6,8 @@
+
+ #pragma once
+
++#include <cstdint>
++
+ #ifdef _WIN32
+
+ #ifndef WIN32_LEAN_AND_MEAN
+--- a/third_party/IXWebSocket/ixwebsocket/IXSelectInterrupt.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXSelectInterrupt.h
+@@ -6,8 +6,8 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <memory>
+-#include <stdint.h>
+ #include <string>
+
+ namespace ix
+--- a/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptEvent.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptEvent.h
+@@ -5,8 +5,8 @@
+ #pragma once
+
+ #include "IXSelectInterrupt.h"
++#include <cstdint>
+ #include <mutex>
+-#include <stdint.h>
+ #include <string>
+ #include <deque>
+ #ifdef _WIN32
+--- a/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptPipe.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXSelectInterruptPipe.h
+@@ -7,6 +7,7 @@
+ #pragma once
+
+ #include "IXSelectInterrupt.h"
++#include <cstdint>
+ #include <mutex>
+ #include <stdint.h>
+ #include <string>
+--- a/third_party/IXWebSocket/ixwebsocket/IXSocket.cpp
++++ b/third_party/IXWebSocket/ixwebsocket/IXSocket.cpp
+@@ -14,7 +14,6 @@
+ #include <array>
+ #include <assert.h>
+ #include <fcntl.h>
+-#include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/third_party/IXWebSocket/ixwebsocket/IXSocket.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXSocket.h
+@@ -7,6 +7,7 @@
+ #pragma once
+
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <memory>
+ #include <mutex>
+--- a/third_party/IXWebSocket/ixwebsocket/IXSocketMbedTLS.cpp
++++ b/third_party/IXWebSocket/ixwebsocket/IXSocketMbedTLS.cpp
+@@ -14,6 +14,7 @@
+ #include "IXNetSystem.h"
+ #include "IXSocket.h"
+ #include "IXSocketConnect.h"
++#include <cstdint>
+ #include <string.h>
+
+ #ifdef _WIN32
+--- a/third_party/IXWebSocket/ixwebsocket/IXUuid.cpp
++++ b/third_party/IXWebSocket/ixwebsocket/IXUuid.cpp
+@@ -16,6 +16,7 @@
+
+ #include "IXUuid.h"
+
++#include <cstdint>
+ #include <iomanip>
+ #include <random>
+ #include <sstream>
+--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocket.cpp
++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocket.cpp
+@@ -13,6 +13,7 @@
+ #include "IXWebSocketHandshake.h"
+ #include <cassert>
+ #include <cmath>
++#include <cstdint>
+
+
+ namespace
+--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocket.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocket.h
+@@ -21,6 +21,7 @@
+ #include "IXWebSocketTransport.h"
+ #include <atomic>
+ #include <condition_variable>
++#include <cstdint>
+ #include <mutex>
+ #include <string>
+ #include <thread>
+--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflate.cpp
++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflate.cpp
+@@ -46,6 +46,8 @@
+ *
+ */
+
++#include <cstdint>
++
+ #include "IXWebSocketPerMessageDeflate.h"
+
+ #include "IXUniquePtr.h"
+--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateCodec.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateCodec.h
+@@ -10,6 +10,7 @@
+ #include "zlib.h"
+ #endif
+ #include <array>
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include "IXWebSocketSendData.h"
+--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateOptions.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketPerMessageDeflateOptions.h
+@@ -6,6 +6,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <string>
+
+ namespace ix
+--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketSendData.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketSendData.h
+@@ -6,6 +6,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include <iterator>
+--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.cpp
++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.cpp
+@@ -45,7 +45,6 @@
+ #include <cstdarg>
+ #include <cstdlib>
+ #include <sstream>
+-#include <stdlib.h>
+ #include <string.h>
+ #include <string>
+ #include <thread>
+--- a/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.h
++++ b/third_party/IXWebSocket/ixwebsocket/IXWebSocketTransport.h
+@@ -21,6 +21,7 @@
+ #include "IXWebSocketSendData.h"
+ #include "IXWebSocketSendInfo.h"
+ #include <atomic>
++#include <cstdint>
+ #include <functional>
+ #include <list>
+ #include <memory>
+--
+2.39.2
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-games/aseprite/, dev-games/aseprite/files/
@ 2024-12-31 19:20 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-12-31 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 981b635fa4bf9f3410bc97ac771acc08c91fb54c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 18:50:40 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 31 19:16:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=981b635f
dev-games/aseprite: Disable FetchContent
Closes: https://bugs.gentoo.org/935448
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-games/aseprite/aseprite-1.3.5-r1.ebuild | 2 +
.../aseprite-1.3.5-no-fetch-in-cmake-kthx.patch | 108 +++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/dev-games/aseprite/aseprite-1.3.5-r1.ebuild b/dev-games/aseprite/aseprite-1.3.5-r1.ebuild
index 47c13092ccdd..1a168697aa70 100644
--- a/dev-games/aseprite/aseprite-1.3.5-r1.ebuild
+++ b/dev-games/aseprite/aseprite-1.3.5-r1.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.3.2_shared_fmt.patch"
"${FILESDIR}/${PN}-1.3.2_strict-aliasing.patch"
"${FILESDIR}/${P}_laf-strict-aliasing.patch"
+ "${FILESDIR}/${P}-no-fetch-in-cmake-kthx.patch" # bug 935448
)
src_unpack() {
@@ -166,6 +167,7 @@ src_configure() {
local mycmakeargs=(
-DENABLE_CCACHE=OFF
-DENABLE_DESKTOP_INTEGRATION=ON
+ -DENABLE_I18N_STRINGS=OFF
-DENABLE_STEAM=OFF
-DENABLE_TESTS="$(usex test)"
-DENABLE_QT_THUMBNAILER=OFF
diff --git a/dev-games/aseprite/files/aseprite-1.3.5-no-fetch-in-cmake-kthx.patch b/dev-games/aseprite/files/aseprite-1.3.5-no-fetch-in-cmake-kthx.patch
new file mode 100644
index 000000000000..3607ddd18891
--- /dev/null
+++ b/dev-games/aseprite/files/aseprite-1.3.5-no-fetch-in-cmake-kthx.patch
@@ -0,0 +1,108 @@
+From 147777df737d3f26a05d48eff262c8cd15d7fb37 Mon Sep 17 00:00:00 2001
+From: David Capello <david@igara.com>
+Date: Wed, 6 Mar 2024 09:59:20 -0300
+Subject: [PATCH] Don't try to clone strings repo if Git isn't available (fix
+ #4357)
+
+ This can happen when the source code is downloaded as a .zip and the
+ Git command is not available to clone the strings repo.
+
+Don't clone strings repository by default (fix #4489)
+
+ New ENABLE_I18N_STRINGS option (off by default) to avoid compilation
+ errors cloning the strings repo (no connection, no git, etc.).
+
+Fix typo using ENABLE_I18N_STRINGS var
+
+(cherry picked from commit 50d4f9d8028dc56686b7f0720ef4775db7b2f782)
+(cherry picked from commit 064ddef1901b69c45a40a396b7444769e7fbb4c4)
+(cherry picked from commit 8817724e448a297507b9ef4e41c54c75fd99b543)
+---
+ CMakeLists.txt | 1 +
+ src/CMakeLists.txt | 52 +++++++++++++++++++++++++++-------------------
+ 2 files changed, 32 insertions(+), 21 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4945a70dd..64234b9ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -60,6 +60,7 @@ option(ENABLE_DRM "Compile the DRM-enabled version (e.g. for automatic
+ option(ENABLE_STEAM "Compile with Steam library" off)
+ option(ENABLE_DEVMODE "Compile vesion for developers" off)
+ option(ENABLE_UI "Compile UI (turn off to compile CLI-only version)" on)
++option(ENABLE_I18N_STRINGS "Clone i18n strings repo (https://github.com/aseprite/strings) to bin/data/strings.git" off)
+ option(FULLSCREEN_PLATFORM "Enable fullscreen by default" off)
+ option(ENABLE_CLANG_TIDY "Enable static analysis" off)
+ option(ENABLE_CCACHE "Use CCache to improve recompilation speed (optional)" on)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 708dc7c6d..28adf6ae4 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -155,19 +155,27 @@ set(DATA_OUTPUT_DIR ${CMAKE_BINARY_DIR}/bin/data)
+ ######################################################################
+ # Clone "strings" repo with translations into bin/data/strings.git
+
+-include(FetchContent)
+-
+-FetchContent_Declare(
+- clone_strings
+- GIT_REPOSITORY https://github.com/aseprite/strings.git
+- GIT_TAG origin/main
+- SOURCE_DIR ${DATA_OUTPUT_DIR}/strings.git
+- CONFIGURE_COMMAND ""
+- BUILD_COMMAND ""
+- INSTALL_COMMAND ""
+- TEST_COMMAND "")
+-FetchContent_MakeAvailable(clone_strings)
+-add_custom_target(clone_strings DEPENDS clone_strings)
++if(ENABLE_I18N_STRINGS)
++ include(FetchContent)
++ find_package(Git)
++ if(GIT_FOUND)
++ FetchContent_Declare(
++ clone_strings
++ GIT_REPOSITORY https://github.com/aseprite/strings.git
++ GIT_TAG origin/main
++ SOURCE_DIR ${DATA_OUTPUT_DIR}/strings.git
++ CONFIGURE_COMMAND ""
++ BUILD_COMMAND ""
++ INSTALL_COMMAND ""
++ TEST_COMMAND "")
++ FetchContent_MakeAvailable(clone_strings)
++ add_custom_target(clone_strings DEPENDS clone_strings)
++ else()
++ add_custom_target(clone_strings)
++ endif()
++else()
++ add_custom_target(clone_strings)
++endif()
+
+ ######################################################################
+ # Copy data/ directory target into bin/data/
+@@ -182,14 +190,16 @@ foreach(fn ${src_data_files})
+ list(APPEND out_data_files ${DATA_OUTPUT_DIR}/${fn})
+ endforeach()
+
+-# Copy original en.ini to strings.git/en.ini to keep it updated. We
+-# have to manually sync the "en.ini" file in the "strings" repo from
+-# the "aseprite" repo.
+-add_custom_command(
+- OUTPUT ${DATA_OUTPUT_DIR}/strings.git/en.ini
+- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SOURCE_DATA_DIR}/strings/en.ini ${DATA_OUTPUT_DIR}/strings.git/en.ini
+- MAIN_DEPENDENCY ${SOURCE_DATA_DIR}/strings/en.ini)
+-list(APPEND out_data_files ${DATA_OUTPUT_DIR}/strings.git/en.ini)
++if(ENABLE_I18N_STRINGS AND GIT_FOUND)
++ # Copy original en.ini to strings.git/en.ini to keep it updated. We
++ # have to manually sync the "en.ini" file in the "strings" repo from
++ # the "aseprite" repo.
++ add_custom_command(
++ OUTPUT ${DATA_OUTPUT_DIR}/strings.git/en.ini
++ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SOURCE_DATA_DIR}/strings/en.ini ${DATA_OUTPUT_DIR}/strings.git/en.ini
++ MAIN_DEPENDENCY ${SOURCE_DATA_DIR}/strings/en.ini)
++ list(APPEND out_data_files ${DATA_OUTPUT_DIR}/strings.git/en.ini)
++endif()
+
+ add_custom_command(
+ OUTPUT ${DATA_OUTPUT_DIR}/README.md
+--
+2.47.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-12-31 19:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-19 19:39 [gentoo-commits] repo/gentoo:master commit in: dev-games/aseprite/, dev-games/aseprite/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-12-31 19:20 Andreas Sturmlechner
2016-09-14 11:19 Patrice Clement
2016-04-23 7:08 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox