Gentoo Archives: gentoo-commits

From: "Azamat H. Hackimov" <winterheart@××××××.ru>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: dev-games/aseprite/, dev-games/aseprite/files/
Date: Thu, 07 Jul 2016 23:24:56
Message-Id: 1467933875.5e58b916cdb360e8a1753b33f6a64a8cfa3b2243.winterheart@gentoo
1 commit: 5e58b916cdb360e8a1753b33f6a64a8cfa3b2243
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Thu Jul 7 23:24:35 2016 +0000
4 Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
5 CommitDate: Thu Jul 7 23:24:35 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=5e58b916
7
8 dev-games/aseprite: bump to 1.1.6.
9
10 Package-Manager: portage-2.2.28
11 Manifest-Sign-Key: A018DE8C
12
13 ...eprite-1.1.4.1.ebuild => aseprite-1.1.6.ebuild} | 40 ++++++++++++++++++----
14 .../files/aseprite-1.1.4.1_underlinking.patch | 12 -------
15 dev-games/aseprite/metadata.xml | 18 +++++++---
16 3 files changed, 47 insertions(+), 23 deletions(-)
17
18 diff --git a/dev-games/aseprite/aseprite-1.1.4.1.ebuild b/dev-games/aseprite/aseprite-1.1.6.ebuild
19 similarity index 65%
20 rename from dev-games/aseprite/aseprite-1.1.4.1.ebuild
21 rename to dev-games/aseprite/aseprite-1.1.6.ebuild
22 index f89be11..fb64e0e 100644
23 --- a/dev-games/aseprite/aseprite-1.1.4.1.ebuild
24 +++ b/dev-games/aseprite/aseprite-1.1.6.ebuild
25 @@ -17,24 +17,26 @@ LICENSE="BSD GPL-2 MIT"
26 SLOT="0"
27 KEYWORDS="~amd64 ~x86"
28
29 -IUSE="debug test webp"
30 +IUSE="debug kde gtk3 test webp"
31
32 RDEPEND="dev-libs/tinyxml
33 media-libs/allegro:0[X,png]
34 media-libs/freetype
35 - media-libs/giflib
36 + media-libs/giflib:=
37 webp? ( media-libs/libwebp )
38 - media-libs/libpng:0
39 + media-libs/libpng:0=
40 net-misc/curl
41 sys-libs/zlib
42 virtual/jpeg:0
43 x11-libs/libX11
44 - x11-libs/pixman"
45 + x11-libs/pixman
46 + gtk3? ( dev-cpp/gtkmm:3.0 )
47 + kde? (
48 + dev-qt/qtcore:5
49 + kde-frameworks/kio:5 )"
50 DEPEND="${RDEPEND}
51 app-arch/unzip"
52
53 -PATCHES=( "${FILESDIR}"/${P}_underlinking.patch )
54 -
55 DOCS=( docs/files/ase.txt
56 docs/files/fli.txt
57 docs/files/msk.txt
58 @@ -51,6 +53,9 @@ src_prepare() {
59 if use debug ; then
60 sed -i '/-DNDEBUG/d' CMakeLists.txt || die
61 fi
62 +
63 + # Fix shebang in thumbnailer
64 + sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' desktop/aseprite-thumbnailer || die
65 }
66
67 src_configure() {
68 @@ -70,9 +75,30 @@ src_configure() {
69 -DUSE_SHARED_TINYXML=ON
70 -DUSE_SHARED_ZLIB=ON
71 -DUSE_SHARED_LIBWEBP=ON
72 + -DWITH_DESKTOP_INTEGRATION=ON
73 + -DWITH_GTK_FILE_DIALOG_SUPPORT="$(usex gtk3)"
74 + -DWITH_QT_THUMBNAILER="$(usex kde)"
75 -DWITH_WEBP_SUPPORT="$(usex webp)"
76 -DENABLE_TESTS="$(usex test)"
77 )
78 -
79 cmake-utils_src_configure
80 +
81 +# if use kde; then
82 +# mycmakeargs=( )
83 +# CMAKE_USE_DIR="${S}/desktop/kde" \
84 +# BUILD_DIR="${WORKDIR}/${P}_desktop_build" \
85 +# cmake-utils_src_configure
86 +# fi
87 }
88 +
89 +#src_compile() {
90 +# cmake-utils_src_compile
91 +# use kde && BUILD_DIR="${WORKDIR}/${P}_desktop_build" \
92 +# cmake-utils_src_compile
93 +#}
94 +
95 +#src_install() {
96 +# cmake-utils_src_install
97 +# use kde && BUILD_DIR="${WORKDIR}/${P}_desktop_build" \
98 +# cmake-utils_src_install
99 +#}
100
101 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
102 deleted file mode 100644
103 index e485571..0000000
104 --- a/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
105 +++ /dev/null
106 @@ -1,12 +0,0 @@
107 -diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
108 -index eddf386..d1b8ce5 100644
109 ---- a/src/she/CMakeLists.txt
110 -+++ b/src/she/CMakeLists.txt
111 -@@ -205,6 +205,7 @@ endif()
112 - add_library(she ${SHE_SOURCES})
113 -
114 - target_link_libraries(she
115 -+ ${PLATFORM_LIBS}
116 - gfx-lib
117 - base-lib)
118 -
119
120 diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
121 index bafa309..7f80b35 100644
122 --- a/dev-games/aseprite/metadata.xml
123 +++ b/dev-games/aseprite/metadata.xml
124 @@ -1,13 +1,23 @@
125 -<?xml version='1.0' encoding='UTF-8'?>
126 +<?xml version="1.0" encoding="UTF-8"?>
127 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
128 <pkgmetadata>
129 - <maintainer>
130 - <email>maintainer-needed@g.o</email>
131 + <maintainer type="person">
132 + <email>azamat.hackimov@×××××.com</email>
133 + <name>Azamat H. Hackimov</name>
134 + <description>Proxy maintainer for this package</description>
135 + </maintainer>
136 + <maintainer type="project">
137 + <email>proxy-maint@g.o</email>
138 + <name>Proxy Maintainers</name>
139 </maintainer>
140 <longdescription>
141 Animated sprite editor and pixel art tool
142 </longdescription>
143 <use>
144 - <flag name="webp">Enable webp image format support</flag>
145 + <flag name="gtk3">Enable support for the experimental native GTK File Dialog</flag>
146 + <flag name="webp">Enable webp image format support</flag>
147 </use>
148 + <upstream>
149 + <remote-id type="github">aseprite/aseprite</remote-id>
150 + </upstream>
151 </pkgmetadata>