gentoo resync : 05.02.2020

3 files changed, 25 insertions, 25 deletions

diff --git a/media-libs/simage/files/simage-1.7.0-libpng15.patch b/media-libs/simage/files/simage-1.7.0-libpng15.patch
deleted file mode 100644
index f99d474cf04a..000000000000
--- a/media-libs/simage/files/simage-1.7.0-libpng15.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN simage-1.7.0/src/simage_png.c new/src/simage_png.c
---- simage-1.7.0/src/simage_png.c	2010-02-26 16:47:31.000000000 +0100
-+++ new/src/simage_png.c	2013-06-06 22:34:23.537331509 +0200
-@@ -323,7 +323,7 @@
-   /* Set error handling.  REQUIRED if you aren't supplying your own
-    * error hadnling functions in the png_create_write_struct() call.
-    */
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     /* If we get here, we had a problem reading the file */
-     fclose(fp);
-     png_destroy_write_struct(&png_ptr,  (png_infopp)info_ptr);
diff --git a/media-libs/simage/files/simage-1.7.0-pkgconfig-partial.patch b/media-libs/simage/files/simage-1.7.0-pkgconfig-partial.patch
deleted file mode 100644
index c8c893855e8a..000000000000
--- a/media-libs/simage/files/simage-1.7.0-pkgconfig-partial.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN simage-1.7.0/simage.pc.in new/simage.pc.in
---- simage-1.7.0/simage.pc.in	2010-02-26 16:47:31.000000000 +0100
-+++ new/simage.pc.in	2013-06-06 22:35:42.303326845 +0200
-@@ -8,7 +8,8 @@
- Version: @VERSION@
- Requires:
- Conflicts:
--Libs: -L${libdir} @SIMAGE_EXTRA_LDFLAGS@ @SIMAGE_EXTRA_LIBS@
-+Libs: -L${libdir} -lsimage
-+Libs.private: -L${libdir} @SIMAGE_EXTRA_LIBS@
- Cflags: -I${includedir} @SIMAGE_EXTRA_CFLAGS@ @SIMAGE_EXTRA_CPPFLAGS@
- 
- simage_host="@host@"
diff --git a/media-libs/simage/files/simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch b/media-libs/simage/files/simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch
new file mode 100644
index 000000000000..4dcc5994f360
--- /dev/null
+++ b/media-libs/simage/files/simage-1.8.0-0001-CMakeLists.txt-comment-cpack.d-inclusion.patch
@@ -0,0 +1,25 @@
+From 1c0e3fb6deb9c3d3c1dd1d4940ffe8d71c2158c9 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Mon, 20 Jan 2020 18:45:10 +0100
+Subject: [PATCH] CMakeLists.txt: comment cpack.d inclusion
+
+Directory is not included in tarball and not needed on Gentoo.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 775037a..e3deb01 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -627,4 +627,4 @@ install(EXPORT ${PROJECT_NAME}
+ 

+ # ############################################################################

+ # New CPACK section, please see the README file inside cpack.d directory.

+-add_subdirectory(cpack.d)

++#add_subdirectory(cpack.d)

+-- 
+2.25.0
+