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

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

[Markus Meier]

commit:     f8ba8afb7c74c07ad25e92f4dca481fb11d6206c
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 18:02:24 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 18:02:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8ba8afb

media-gfx/graphicsmagick: remove unused patches, bug #597858

Package-Manager: portage-2.3.2

 .../files/graphicsmagick-1.3.18-freetype.patch     | 32 ----------------------
 .../files/graphicsmagick-1.3.18-powerpc.patch      | 11 --------
 2 files changed, 43 deletions(-)

diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch
deleted file mode 100644
index d6504e6..00000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-freetype.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://sourceforge.net/tracker/?func=detail&aid=3601612&group_id=73485&atid=537940
-
---- GraphicsMagick-1.3.18/configure
-+++ GraphicsMagick-1.3.18/configure
-@@ -22249,7 +22249,6 @@
- # directory as GraphicsMagick installation prefix.
- #LDFLAGS="$LDFLAGS -L$LIB_DIR"
- #CPPFLAGS="$CPPFLAGS -I$INCLUDE_DIR"
--MAGICK_API_CPPFLAGS="-I$INCLUDE_DIR/GraphicsMagick $MAGICK_API_CPPFLAGS"
- 
- #
- # Find the X11 RGB database
-@@ -25994,8 +25993,8 @@
-     then
-       freetype_prefix=`${freetype_config} --prefix`
-       freetype_exec_prefix=`${freetype_config} --exec-prefix`
--      LDFLAGS="$LDFLAGS -L${freetype_exec_prefix}/lib"
--      CPPFLAGS="$CPPFLAGS -I${freetype_prefix}/include/freetype2"
-+      LDFLAGS="$LDFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --libs`"
-+      CPPFLAGS="$CPPFLAGS `${PKG_CONFIG:-pkg-config} freetype2 --cflags`"
-     fi
- 
-     if test "$LIB_TTF" = ''
-@@ -29605,7 +29604,7 @@
- 
- MAGICK_API_CFLAGS=$CFLAGS
- MAGICK_API_CPPFLAGS=`echo $MAGICK_API_CPPFLAGS | sed -e 's/  */ /g'`
--MAGICK_API_LDFLAGS="-L$LIB_DIR $LDFLAGS"
-+MAGICK_API_LDFLAGS="$LDFLAGS"
- MAGICK_API_DEP_LIBS="$MAGICK_DEP_LIBS"
- MAGICK_API_LIBS="-lGraphicsMagick $MAGICK_API_DEP_LIBS"
- 

diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch
deleted file mode 100644
index 30a67fd..00000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.18-powerpc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/magick/studio.h
-+++ b/magick/studio.h
-@@ -51,7 +51,7 @@
-   threads.  Most CPUs have cache lines of 32 or 64 bytes.  IBM Power CPUs have
-   cache lines of 128 bytes.
- */
--#if defined(MAGICK_TARGET_CPU) && (MAGICK_TARGET_CPU == powerpc)
-+#ifdef __powerpc__
- #  define MAGICK_CACHE_LINE_SIZE 128
- #else
- #  define MAGICK_CACHE_LINE_SIZE 64

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

[David Seifert]

commit:     6866a12786bbb0ee769552df25082947a862bb00
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 23 15:59:44 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 13:11:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6866a127

media-gfx/graphicsmagick: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/3224

 .../files/graphicsmagick-1.3.20-powerpc.patch        | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.20-powerpc.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.20-powerpc.patch
deleted file mode 100644
index 44a1358..00000000
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.20-powerpc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- GraphicsMagick-1.3.20/magick/studio.h
-+++ GraphicsMagick-1.3.20/magick/studio.h
-@@ -51,12 +51,11 @@
-   threads.  Most CPUs have cache lines of 32 or 64 bytes.  IBM Power CPUs have
-   cache lines of 128 bytes.
- */
--/* FIXME: C pre-processor does not support comparing strings. */
--/* #if defined(MAGICK_TARGET_CPU) && (MAGICK_TARGET_CPU == powerpc) */
--/* #  define MAGICK_CACHE_LINE_SIZE 128 */
--/* #else */
--#  define MAGICK_CACHE_LINE_SIZE 64
--/* #endif */
-+#ifdef __powerpc__
-+#define MAGICK_CACHE_LINE_SIZE 128
-+#else
-+#define MAGICK_CACHE_LINE_SIZE 64
-+#endif
- 
- 
- /*

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

[Sam James]

commit:     d50f4a050f4325c26ee9c9e1127da0527bc194b3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 17 20:00:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 17 20:00:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d50f4a05

media-gfx/graphicsmagick: add link to upstream commit

Closes: https://bugs.gentoo.org/641164
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
index 142b4c0b013..5a78527b228 100644
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.36-bzip-no-zlib.patch
@@ -1,3 +1,5 @@
+http://hg.code.sf.net/p/graphicsmagick/code//rev/d9ec69e25e9e
+
 Sent upstream.
 
 # User Sam James <sam@gentoo.org>

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

[Sam James]

commit:     60c37bb01235c28144854631e3230c894a63621a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 27 22:55:47 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 22:55:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c37bb0

media-gfx/graphicsmagick: enhance patch description

Bug: https://bugs.gentoo.org/920788
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch
index 4092a7303dc9..05e151c1efab 100644
--- a/media-gfx/graphicsmagick/files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch
+++ b/media-gfx/graphicsmagick/files/graphicsmagick-1.3.42-autoconf-2.72-perl-lfs.patch
@@ -1,5 +1,17 @@
+Sent upstream by mail.
+
 https://bugs.gentoo.org/920788
 https://github.com/ImageMagick/ImageMagick/pull/6978
+
+configure.ac: fixup LFS check for autoconf-2.72
+
+For the 'other' case, we were using the value of ac_cv_sys_file_offset_bits for
+-D_FILE_OFFSET_BITS to pass down into the Perl module build, but autoconf-2.72
+drops the use of ac_cv_sys_file_offset_bits in cf09f48841b66fe76f606dd6018bb3a93242a7c9,
+so this ends up defining '-D_FILE_OFFSET_BITS=' which then breaks the build.
+
+I've just added a hack to preserve the old behaviour to avoid passing a blank
+value.
 --- a/configure.ac
 +++ b/configure.ac
 @@ -386,7 +386,7 @@ AC_FUNC_FSEEKO