[gentoo-commits] repo/proj/guru:master commit in: media-gfx/azpainter/, media-gfx/azpainter/files/

2024-02-01 Thread David Roman
commit: 8315d328efc493b4cb5b3fcf8e917cbd70d54752
Author: Takuya Wakazono  gmail  com>
AuthorDate: Thu Feb  1 10:52:00 2024 +
Commit: David Roman  gmail  com>
CommitDate: Thu Feb  1 10:58:09 2024 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8315d328

media-gfx/azpainter: add 3.0.7

Closes: https://bugs.gentoo.org/860057
Signed-off-by: Takuya Wakazono  gmail.com>

 media-gfx/azpainter/Manifest   |  1 +
 media-gfx/azpainter/azpainter-3.0.7.ebuild | 62 ++
 .../files/azpainter-3.0.7-strict-aliasing.patch| 61 +
 3 files changed, 124 insertions(+)

diff --git a/media-gfx/azpainter/Manifest b/media-gfx/azpainter/Manifest
index a523d1cc6c..0e5b84ccfd 100644
--- a/media-gfx/azpainter/Manifest
+++ b/media-gfx/azpainter/Manifest
@@ -1,2 +1,3 @@
 DIST azpainter-v3.0.3.tar.gz 1260272 BLAKE2B 
b0d7e21f4a24ef27e6d4cbc639624dcc333d19f477dbf436bf72929473e07318246009d3291e56296d8f8a46d1f10d2dc1b8224f99c94dc46672f9c91827ce9f
 SHA512 
7c363127d1bb3ad9c212ec3a226b047edff0452e46d0d8de52fefaf2399d72a4e3211b2b32ea57a43a9d705ad06729543c4ab401dba672a909568b7935b67801
 DIST azpainter-v3.0.4.tar.gz 1283239 BLAKE2B 
a0632909c4b066309fd5a696b7839526f5a2a4dbf91a3c77a27ad199ea83fb09b5f711effe3c77da629e2dfffe30a0b09eda66a939affa1f52f3c73ed3ca14e1
 SHA512 
44fd259d50ef794c223e7bed9f4ccf9c5fe6b0905e521066e279b33c836d8d0090c01229b63444ea459477f2aef174d9876b1811753d0a253cef02ffe4e95af2
+DIST azpainter-v3.0.7.tar.bz2 992188 BLAKE2B 
a027ddcc424a3d3edaeae3a50e5c8bf24214f1420f1e99aaae0ddcc3ec7401a032b7aea5181e0efc7c55855deb65580d355ee2859f7603bb321b461f2cf57843
 SHA512 
bf46b4a895bb4a2abf4d88442eacee3d580ae93a07de281af4bf57397b08dcd88fa8064693e54d285e101463fc010ebec4e0d54d735e0c26a4cbdacd4ce11a0d

diff --git a/media-gfx/azpainter/azpainter-3.0.7.ebuild 
b/media-gfx/azpainter/azpainter-3.0.7.ebuild
new file mode 100644
index 00..35036a1f0c
--- /dev/null
+++ b/media-gfx/azpainter/azpainter-3.0.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2018-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo ninja-utils toolchain-funcs xdg
+
+DESCRIPTION="Full color painting software for Linux for illustration drawing"
+HOMEPAGE="http://azsky2.html.xdomain.jp/soft/azpainter.html
+   https://gitlab.com/azelpg/azpainter;
+SRC_URI="https://gitlab.com/azelpg/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2;
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+   media-libs/fontconfig
+   media-libs/freetype
+   media-libs/libjpeg-turbo:=
+   media-libs/libpng:=
+   media-libs/libwebp:=
+   media-libs/tiff:=
+   sys-libs/zlib:=
+   x11-libs/libX11
+   x11-libs/libXcursor
+   x11-libs/libXext
+   x11-libs/libXi
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+   ${NINJA_DEPEND}
+   virtual/pkgconfig
+"
+
+DOCS=(
+   about_mlk_en.txt
+   about_mlk_ja.txt
+   translation/tool/about-en.txt
+   translation/tool/about-ja.txt
+)
+
+PATCHES=( "${FILESDIR}/${P}-strict-aliasing.patch" )
+
+src_prepare() {
+   sed -i "s|ar rc|$(tc-getAR) rc|" build.ninja.in || die
+   sed -i "s|doc/@PACKAGE_NAME@|doc/${PF}|" install.sh.in || die
+   default
+}
+
+src_configure() {
+   edo sh ./configure --prefix="${EPREFIX}/usr" CC="$(tc-getCC)" 
CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+   eninja -C build
+}
+
+src_install() {
+   DESTDIR="${D}" eninja -C build install
+}

diff --git a/media-gfx/azpainter/files/azpainter-3.0.7-strict-aliasing.patch 
b/media-gfx/azpainter/files/azpainter-3.0.7-strict-aliasing.patch
new file mode 100644
index 00..44da8ac4c9
--- /dev/null
+++ b/media-gfx/azpainter/files/azpainter-3.0.7-strict-aliasing.patch
@@ -0,0 +1,61 @@
+https://bugs.gentoo.org/860057
+
+diff --git a/src/draw/draw_image.c b/src/draw/draw_image.c
+index 531101a..f225164 100644
+--- a/src/draw/draw_image.c
 b/src/draw/draw_image.c
+@@ -21,6 +21,8 @@ $*/
+  * AppDraw: イメージ関連
+  */
+ 
++#include 
++
+ #include 
+ #include 
+ #include 
+@@ -798,7 +800,7 @@ mlkerr drawImage_blendImageReal_alpha(AppDraw *p,int 
dstbits,mPopupProgress *pro
+   {
+   //8bit は常に 8bit
+ 
+-  *((uint32_t *)pd) = *((uint32_t *));
++  memcpy(, , sizeof(uint32_t));
+ 
+   pd += 4;
+   }
+diff --git a/src/image/tileimage_imagefile.c b/src/image/tileimage_imagefile.c
+index e05e633..9b2d3ef 100644
+--- a/src/image/tileimage_imagefile.c
 b/src/image/tileimage_imagefile.c
+@@ -165,7 +165,7 @@ static void _loadimgbuf_convert_8to16(uint8_t **ppbuf,int 
width,int height,mlkbo
+   c[2] = tbl[pd8[2]];
+   c[3] = tbl[(ignore_alpha)? 255: pd8[3]];
+ 
+-  

[gentoo-commits] repo/proj/guru:master commit in: media-gfx/azpainter/, media-gfx/azpainter/files/

2020-04-30 Thread Andrew Ammerlaan
commit: dc70a5b1918c5cf435e1baf7987a0f848bffb037
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Thu Apr 30 03:35:24 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Thu Apr 30 03:35:24 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dc70a5b1

media-gfx/azpainter: Bump to 2.1.6

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>

 media-gfx/azpainter/Manifest   |   1 +
 media-gfx/azpainter/azpainter-2.1.6.ebuild |  34 +
 .../files/azpainter-2.1.6-fix_configure.patch  |  83 +++
 .../files/azpainter-2.1.6-signed_char.patch| 156 +
 4 files changed, 274 insertions(+)

diff --git a/media-gfx/azpainter/Manifest b/media-gfx/azpainter/Manifest
index 351f1bb..bf31471 100644
--- a/media-gfx/azpainter/Manifest
+++ b/media-gfx/azpainter/Manifest
@@ -1 +1,2 @@
 DIST azpainter-2.1.5.tar.xz 825892 BLAKE2B 
c6430393bb7dc3fd4b38357f696ec1da567b2b5763ed5e51526fa7948bf8c7a25b8200771607ecd86ed927d3692c5b4a72c471d8e354a7da48aa952b934ea852
 SHA512 
9797a22d512a26cdf2d441f91c5b77e9a8221433d33359782486f2254fffdaa30daae04da77e899b4068e5988aa67dfda3b7bb915d41a807e3069f84c8d15a3a
+DIST azpainter-2.1.6.tar.xz 747464 BLAKE2B 
a3d242cb3fa881c761711595686362924e55125f7b33def30949c321b6a23ccb2bed1b4d3df0b7e73ebd4a5f6a75e7c4b99c4116d5e6af62518d03fc92e6de81
 SHA512 
94ebe3ad8df7148d73a6f73fe383df2d8b9203aa67ef77ebcc68c8fa937ba134315ca757693c5ad33bdf79afd90915779a3086d24f5a81ab767eced50d4d97d9

diff --git a/media-gfx/azpainter/azpainter-2.1.6.ebuild 
b/media-gfx/azpainter/azpainter-2.1.6.ebuild
new file mode 100644
index 000..1176940
--- /dev/null
+++ b/media-gfx/azpainter/azpainter-2.1.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Full color painting software for Linux for illustration drawing"
+HOMEPAGE="http://azsky2.html.xdomain.jp/linux/azpainter.html 
https://github.com/Symbian9/azpainter;
+SRC_URI="https://github.com/Symbian9/azpainter/releases/download/v${PV}/${P}.tar.xz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+   x11-libs/libX11:=
+   x11-libs/libXext:=
+   x11-libs/libXi:=
+   media-libs/freetype:=
+   media-libs/fontconfig:=
+   sys-libs/zlib:=
+   media-libs/libpng:=
+   media-libs/libjpeg-turbo:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-fix_configure.patch"
+   "${FILESDIR}/${P}-signed_char.patch"
+)
+
+src_configure() {
+   sh ./configure --prefix=/usr CFLAGS="${CFLAGS:-02}" LDFLAGS="${LDFLAGS}"
+}

diff --git a/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch 
b/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch
new file mode 100644
index 000..f8824dd
--- /dev/null
+++ b/media-gfx/azpainter/files/azpainter-2.1.6-fix_configure.patch
@@ -0,0 +1,83 @@
+From 185bf21dd0040a11cbffddb6e4bcf7af46a5bef7 Mon Sep 17 00:00:00 2001
+From: app4soft 
+Date: Sun, 26 Apr 2020 06:54:09 +0300
+Subject: [PATCH] Update configure
+
+---
+ README|  2 +-
+ README_ja |  2 +-
+ configure | 11 ++-
+ 3 files changed, 8 insertions(+), 7 deletions(-)
+ mode change 100755 => 100644 configure
+
+diff --git a/README b/README
+index ba5f2c8..610e423 100644
+--- a/README
 b/README
+@@ -90,7 +90,7 @@ $ gmake
+ 
+ ## MacOS
+ 
+-$ ./configure --prefix=/usr/X11
++$ ./configure --prefix=/opt/X11
+ $ make
+ $ sudo make install
+ 
+diff --git a/README_ja b/README_ja
+index db190f2..997a499 100644
+--- a/README_ja
 b/README_ja
+@@ -102,7 +102,7 @@ $ gmake
+ 
+ ## MacOS
+ 
+-$ ./configure --prefix=/usr/X11
++$ ./configure --prefix=/opt/X11
+ $ make
+ $ sudo make install
+ 
+diff --git a/configure b/configure
+old mode 100755
+new mode 100644
+index cb9a9f6..e98b20f
+--- a/configure
 b/configure
+@@ -9,7 +9,7 @@ cat <<_ZYXW_
+ 
+ Options:
+   --help display this help
+-  --debugcreate debug exe (CFLAGS += -g)
++  --debugcreate debug exe (CFLAGS = -g)
+   --arch=[ARCH]  CFLAGS += "-march=ARCH"
+ 
+   --prefix=[PREFIX]   install dir
+@@ -202,7 +202,8 @@ for opt;do
+   --no-check-lib)
+   cf_check_lib=no ;;
+   *=*)
+-  eval "$opt" ;;
++  tmp2=`expr "X$opt" : 'X\([^=]*\)=.*'`
++  eval $tmp2=\'$tmp1\' ;;
+   *)
+   echo "unknown option: $opt"
+   exit 1 ;;
+@@ -226,8 +227,8 @@ tmp1=`uname`
+ if test "$tmp1" = Linux;then cf_os=linux
+ elif test "$tmp1" = Darwin;then
+   cf_os=mac
+-  CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/X11/include"`
+-  LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/X11/lib"`
++  CFLAGS=`fc_add_string "$CFLAGS" "-I/opt/X11/include"`
++  LDFLAGS=`fc_add_string "$LDFLAGS" "-L/opt/X11/lib"`
+ elif test "$tmp1" = FreeBSD;then
+   cf_os=freebsd
+   cf_make=gmake
+@@ -311,7 +312,7 @@ fc_check_lib libjpeg "libjpeg" ""