[gentoo-commits] repo/gentoo:master commit in: media-gfx/maim/files/, media-gfx/maim/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/maim/files/, media-gfx/maim/

[Matthias Maier]

commit:     17ce1a7e7c0047e473db7b635a7988aa924e8f2d
Author:     Ingolf Wagner <contact <AT> ingolf-wagner <DOT> de>
AuthorDate: Sat Jun  3 20:46:09 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 21:01:43 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ce1a7e

media-gfx/maim: remove gengetopt dependency

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 .../maim/files/maim-3.4.47-no-gengetopt.patch      | 24 ++++++++++++++++++++++
 media-gfx/maim/maim-3.4.47.ebuild                  |  5 +++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch b/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch
new file mode 100644
index 00000000000..7a1035d3daf
--- /dev/null
+++ b/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fe4cd5f..f0eb718 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,19 +65,6 @@ if ( RONN_EXECUTABLE AND GZIP_EXECUTABLE )
+                        WORKING_DIRECTORY man-src VERBATIM )
+ endif()
+ 
+-# Here we generate some of our code if we can. I package it pre-generated
+-# so nobody has to go find and install gengetopt if they don't want to.
+-find_program( GENGETOPT_EXECUTABLE gengetopt
+-              DOC "A tool to generate code to grab command line options." )
+-if ( GENGETOPT_EXECUTABLE )
+-    message( "-- Regenerating cmdline.in" )
+-    execute_process( COMMAND "${GENGETOPT_EXECUTABLE}" "--input=options.ggo"
+-                     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" )
+-    file( RENAME "${CMAKE_SOURCE_DIR}/src/cmdline.h" "${CMAKE_SOURCE_DIR}/src/cmdline.in" )
+-else()
+-    message( "Warning: Command gengetopt not found! Won't regenerate command line code. (If you're just compiling this doesn't matter.)" )
+-endif()
+-
+ # By default our src/options.ggo has our cmake versions variables for
+ # the 'version ""' line. We replace them here.
+ # The ${CMAKE_SOURCE_DIR} is there to fix problems with OpenBSD's out-of-source build black magic.

diff --git a/media-gfx/maim/maim-3.4.47.ebuild b/media-gfx/maim/maim-3.4.47.ebuild
index f6069b30a18..374899e4f47 100644
--- a/media-gfx/maim/maim-3.4.47.ebuild
+++ b/media-gfx/maim/maim-3.4.47.ebuild
@@ -14,12 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+PATCHES=( "${FILESDIR}/maim-3.4.47-no-gengetopt.patch" )
+
 DEPEND="
 	media-libs/imlib2[X]
 	x11-libs/libX11
 	x11-libs/libXrandr
-	x11-libs/libXfixes
-	dev-util/gengetopt"
+	x11-libs/libXfixes"
 RDEPEND="
 	${DEPEND}
 	x11-misc/slop"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/maim/files/, media-gfx/maim/

[Michael Palimaka]

commit:     b2bc66ef59e1db5b9108776b148098de1870172e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 09:13:24 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 09:13:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2bc66ef

media-gfx/maim: remove 3.4.47

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 media-gfx/maim/Manifest                            |  1 -
 .../maim/files/maim-3.4.47-no-gengetopt.patch      | 24 --------------------
 media-gfx/maim/maim-3.4.47.ebuild                  | 26 ----------------------
 3 files changed, 51 deletions(-)

diff --git a/media-gfx/maim/Manifest b/media-gfx/maim/Manifest
index b07dc1b4b35..63e53fc91bf 100644
--- a/media-gfx/maim/Manifest
+++ b/media-gfx/maim/Manifest
@@ -1,2 +1 @@
-DIST maim-3.4.47.tar.gz 46799 BLAKE2B 9678caccc89f2c85a51e5fcad9691ab1ec17ecb88c383611f35f6f4692cac272c51df0e389256260985e155f0317acb583fea49be6d1bcfbebdb0014840ce997 SHA512 4b21f8ad8f9f2f19693d5c489f5e815133e1b8308653c52934cdb8a3d8ae38732733a5ffb5527b44db49f59c3818a9bc83840ced5db71807a68277d0dcc03392
 DIST maim-5.4.63.tar.gz 39666 BLAKE2B 0c472480f231b84c7f772347d6eeca8620947e5494f176dd4513ee41a5de29e9b90eafbec1bb7064e745e24c9b1043a7ccd9627cbab5561f30f6e8a859273e21 SHA512 d84cfe051109c9c4b79f2a006f2d73a0fa9cd40151c9d6996740326766886f8b070bc49029d0d3810fd8743cc63d76c051fc249e53b4e9ff37faf8708c149dfd

diff --git a/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch b/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch
deleted file mode 100644
index 7a1035d3daf..00000000000
--- a/media-gfx/maim/files/maim-3.4.47-no-gengetopt.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fe4cd5f..f0eb718 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,19 +65,6 @@ if ( RONN_EXECUTABLE AND GZIP_EXECUTABLE )
-                        WORKING_DIRECTORY man-src VERBATIM )
- endif()
- 
--# Here we generate some of our code if we can. I package it pre-generated
--# so nobody has to go find and install gengetopt if they don't want to.
--find_program( GENGETOPT_EXECUTABLE gengetopt
--              DOC "A tool to generate code to grab command line options." )
--if ( GENGETOPT_EXECUTABLE )
--    message( "-- Regenerating cmdline.in" )
--    execute_process( COMMAND "${GENGETOPT_EXECUTABLE}" "--input=options.ggo"
--                     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" )
--    file( RENAME "${CMAKE_SOURCE_DIR}/src/cmdline.h" "${CMAKE_SOURCE_DIR}/src/cmdline.in" )
--else()
--    message( "Warning: Command gengetopt not found! Won't regenerate command line code. (If you're just compiling this doesn't matter.)" )
--endif()
--
- # By default our src/options.ggo has our cmake versions variables for
- # the 'version ""' line. We replace them here.
- # The ${CMAKE_SOURCE_DIR} is there to fix problems with OpenBSD's out-of-source build black magic.

diff --git a/media-gfx/maim/maim-3.4.47.ebuild b/media-gfx/maim/maim-3.4.47.ebuild
deleted file mode 100644
index 374899e4f47..00000000000
--- a/media-gfx/maim/maim-3.4.47.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Commandline tool to take screenshots of the desktop"
-HOMEPAGE="https://github.com/naelstrof/maim"
-SRC_URI="https://github.com/naelstrof/maim/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/maim-3.4.47-no-gengetopt.patch" )
-
-DEPEND="
-	media-libs/imlib2[X]
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXfixes"
-RDEPEND="
-	${DEPEND}
-	x11-misc/slop"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/maim/files/, media-gfx/maim/

[David Seifert]

commit:     92d976e1989d6a319bad89b4c83d0507a80be435
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 10:36:50 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 10:38:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d976e1

media-gfx/maim: Fix building with libjpeg

Bug: https://bugs.gentoo.org/656520
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch | 16 ++++++++++++++++
 media-gfx/maim/maim-5.5.1.ebuild                 |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch b/media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch
new file mode 100644
index 00000000000..83029fab828
--- /dev/null
+++ b/media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch
@@ -0,0 +1,16 @@
+Allow building with libjpeg-9c
+Bug: https://bugs.gentoo.org/656520
+
+--- a/src/image.cpp
++++ b/src/image.cpp
+@@ -187,8 +187,8 @@
+  
+     jpeg_set_defaults(&cinfo);
+     // Convert quality from scale 1-10 to 0-100
+-    jpeg_set_quality (&cinfo, (int)((float)quality-1.f)*(100.f/9.f), true);
+-    jpeg_start_compress(&cinfo, true);
++    jpeg_set_quality (&cinfo, (int)((float)quality-1.f)*(100.f/9.f), TRUE);
++    jpeg_start_compress(&cinfo, TRUE);
+  
+     JSAMPROW row_pointer;
+     unsigned char* buffer    = (unsigned char*)data;

diff --git a/media-gfx/maim/maim-5.5.1.ebuild b/media-gfx/maim/maim-5.5.1.ebuild
index cb8869b7b80..a225be4803a 100644
--- a/media-gfx/maim/maim-5.5.1.ebuild
+++ b/media-gfx/maim/maim-5.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -35,6 +35,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${PN}-5.5.1-libjpeg-9c.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DMAIM_UNICODE=$(usex unicode)

[gentoo-commits] repo/gentoo:master commit in: media-gfx/maim/files/, media-gfx/maim/

[Andreas Sturmlechner]

commit:     8d950fbb236fb5939f8a784fb201165b46720cc7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  8 18:54:49 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov  8 18:56:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d950fbb

media-gfx/maim: Fix build with ICU-75

Thanks-to: Emanuele Torre
Thanks-to: pva
Closes: https://bugs.gentoo.org/937454
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/maim/files/maim-5.8.0-icu-75.patch | 11 +++++++++++
 media-gfx/maim/maim-5.8.0.ebuild             |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/media-gfx/maim/files/maim-5.8.0-icu-75.patch b/media-gfx/maim/files/maim-5.8.0-icu-75.patch
new file mode 100644
index 000000000000..8c7c4163f22e
--- /dev/null
+++ b/media-gfx/maim/files/maim-5.8.0-icu-75.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,7 +38,7 @@ find_package( Threads    REQUIRED )
+ find_package( GLM        REQUIRED )
+ 
+ set_property(TARGET ${BIN_TARGET} PROPERTY CXX_STANDARD_REQUIRED ON)
+-set_property(TARGET ${BIN_TARGET} PROPERTY CXX_STANDARD 11)
++set_property(TARGET ${BIN_TARGET} PROPERTY CXX_STANDARD 17)
+ set_property(TARGET ${BIN_TARGET} PROPERTY CXX_EXTENSIONS OFF)
+ 
+ # Includes

diff --git a/media-gfx/maim/maim-5.8.0.ebuild b/media-gfx/maim/maim-5.8.0.ebuild
index bee0980ae8d2..d8582940073f 100644
--- a/media-gfx/maim/maim-5.8.0.ebuild
+++ b/media-gfx/maim/maim-5.8.0.ebuild
@@ -36,6 +36,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+# Pending issue upstream: https://github.com/naelstrof/maim/issues/292
+PATCHES=( "${FILESDIR}/${P}-icu-75.patch" ) # bug 937454
+
 src_configure() {
 	local mycmakeargs=(
 		-DMAIM_UNICODE=$(usex icu)