summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-09-02 05:34:06 +0200
committerJeroen Roovers <jer@gentoo.org>2016-09-02 05:34:06 +0200
commit0fad2b329f67ec94d2373e9d10bd2fd155aa9e6e (patch)
tree83d908fcc35d637b24c91a271c2b45897b9fddb2 /x11-libs/fltk
parentapp-misc/mosquitto: Version bump to 1.4.10 (diff)
downloadgentoo-0fad2b329f67ec94d2373e9d10bd2fd155aa9e6e.tar.gz
gentoo-0fad2b329f67ec94d2373e9d10bd2fd155aa9e6e.tar.bz2
gentoo-0fad2b329f67ec94d2373e9d10bd2fd155aa9e6e.zip
x11-libs/fltk: Clean up patches.
Package-Manager: portage-2.3.0
Diffstat (limited to 'x11-libs/fltk')
-rw-r--r--x11-libs/fltk/files/fltk-1.3.0-share.patch5
-rw-r--r--x11-libs/fltk/files/fltk-1.3.2-desktop.patch8
-rw-r--r--x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch4
-rw-r--r--x11-libs/fltk/fltk-1.3.9999.ebuild2
4 files changed, 6 insertions, 13 deletions
diff --git a/x11-libs/fltk/files/fltk-1.3.0-share.patch b/x11-libs/fltk/files/fltk-1.3.0-share.patch
index 4b4267a4986..af2092abc89 100644
--- a/x11-libs/fltk/files/fltk-1.3.0-share.patch
+++ b/x11-libs/fltk/files/fltk-1.3.0-share.patch
@@ -1,8 +1,3 @@
- fluid/Makefile | 20 ++++++++++----------
- 1 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/fluid/Makefile b/fluid/Makefile
-index 1cb3210..9d438a5 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -82,16 +82,16 @@ install: all
diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
index abec41a4b05..ef72ba9c3ec 100644
--- a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
+++ b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
@@ -1,5 +1,5 @@
---- fltk-1.3.2/fluid/fluid.desktop
-+++ fltk-1.3.2/fluid/fluid.desktop
+--- a/fluid/fluid.desktop
++++ b/fluid/fluid.desktop
@@ -6,5 +6,5 @@
Icon=fluid
Terminal=false
@@ -7,8 +7,8 @@
-MimeType=application/x-fluid
+MimeType=application/x-fluid;
Categories=Development;GUIDesigner;
---- fltk-1.3.2/fluid/x-fluid.desktop
-+++ fltk-1.3.2/fluid/x-fluid.desktop
+--- a/fluid/x-fluid.desktop
++++ b/fluid/x-fluid.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=MimeType
diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
index 701f04ca616..ed487e7dc24 100644
--- a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
+++ b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
@@ -1,7 +1,7 @@
http://bugs.gentoo.org/479774
---- src/Fl_JPEG_Image.cxx
-+++ src/Fl_JPEG_Image.cxx
+--- a/src/Fl_JPEG_Image.cxx
++++ b/src/Fl_JPEG_Image.cxx
@@ -155,7 +155,7 @@
jpeg_create_decompress(&dinfo);
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index 259d66ebce0..7e769f76aa8 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -39,10 +39,8 @@ DEPEND="
src_prepare() {
rm -rf zlib jpeg png || die
epatch \
- "${FILESDIR}"/${PN}-1.3.2-desktop.patch \
"${FILESDIR}"/${PN}-1.3.0-share.patch \
"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
- "${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
"${FILESDIR}"/${PN}-1.3.3-visibility.patch
sed -i \