| 1 |
commit: 0fad2b329f67ec94d2373e9d10bd2fd155aa9e6e |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 2 03:34:06 2016 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 2 03:34:06 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fad2b32 |
| 7 |
|
| 8 |
x11-libs/fltk: Clean up patches. |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
x11-libs/fltk/files/fltk-1.3.0-share.patch | 5 ----- |
| 13 |
x11-libs/fltk/files/fltk-1.3.2-desktop.patch | 8 ++++---- |
| 14 |
x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch | 4 ++-- |
| 15 |
x11-libs/fltk/fltk-1.3.9999.ebuild | 2 -- |
| 16 |
4 files changed, 6 insertions(+), 13 deletions(-) |
| 17 |
|
| 18 |
diff --git a/x11-libs/fltk/files/fltk-1.3.0-share.patch b/x11-libs/fltk/files/fltk-1.3.0-share.patch |
| 19 |
index 4b4267a..af2092a 100644 |
| 20 |
--- a/x11-libs/fltk/files/fltk-1.3.0-share.patch |
| 21 |
+++ b/x11-libs/fltk/files/fltk-1.3.0-share.patch |
| 22 |
@@ -1,8 +1,3 @@ |
| 23 |
- fluid/Makefile | 20 ++++++++++---------- |
| 24 |
- 1 files changed, 10 insertions(+), 10 deletions(-) |
| 25 |
- |
| 26 |
-diff --git a/fluid/Makefile b/fluid/Makefile |
| 27 |
-index 1cb3210..9d438a5 100644 |
| 28 |
--- a/fluid/Makefile |
| 29 |
+++ b/fluid/Makefile |
| 30 |
@@ -82,16 +82,16 @@ install: all |
| 31 |
|
| 32 |
diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch |
| 33 |
index abec41a..ef72ba9 100644 |
| 34 |
--- a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch |
| 35 |
+++ b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch |
| 36 |
@@ -1,5 +1,5 @@ |
| 37 |
---- fltk-1.3.2/fluid/fluid.desktop |
| 38 |
-+++ fltk-1.3.2/fluid/fluid.desktop |
| 39 |
+--- a/fluid/fluid.desktop |
| 40 |
++++ b/fluid/fluid.desktop |
| 41 |
@@ -6,5 +6,5 @@ |
| 42 |
Icon=fluid |
| 43 |
Terminal=false |
| 44 |
@@ -7,8 +7,8 @@ |
| 45 |
-MimeType=application/x-fluid |
| 46 |
+MimeType=application/x-fluid; |
| 47 |
Categories=Development;GUIDesigner; |
| 48 |
---- fltk-1.3.2/fluid/x-fluid.desktop |
| 49 |
-+++ fltk-1.3.2/fluid/x-fluid.desktop |
| 50 |
+--- a/fluid/x-fluid.desktop |
| 51 |
++++ b/fluid/x-fluid.desktop |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
[Desktop Entry] |
| 54 |
Type=MimeType |
| 55 |
|
| 56 |
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 |
| 57 |
index 701f04c..ed487e7 100644 |
| 58 |
--- a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch |
| 59 |
+++ b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch |
| 60 |
@@ -1,7 +1,7 @@ |
| 61 |
http://bugs.gentoo.org/479774 |
| 62 |
|
| 63 |
---- src/Fl_JPEG_Image.cxx |
| 64 |
-+++ src/Fl_JPEG_Image.cxx |
| 65 |
+--- a/src/Fl_JPEG_Image.cxx |
| 66 |
++++ b/src/Fl_JPEG_Image.cxx |
| 67 |
@@ -155,7 +155,7 @@ |
| 68 |
|
| 69 |
jpeg_create_decompress(&dinfo); |
| 70 |
|
| 71 |
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild |
| 72 |
index 259d66e..7e769f7 100644 |
| 73 |
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild |
| 74 |
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild |
| 75 |
@@ -39,10 +39,8 @@ DEPEND=" |
| 76 |
src_prepare() { |
| 77 |
rm -rf zlib jpeg png || die |
| 78 |
epatch \ |
| 79 |
- "${FILESDIR}"/${PN}-1.3.2-desktop.patch \ |
| 80 |
"${FILESDIR}"/${PN}-1.3.0-share.patch \ |
| 81 |
"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \ |
| 82 |
- "${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \ |
| 83 |
"${FILESDIR}"/${PN}-1.3.3-visibility.patch |
| 84 |
|
| 85 |
sed -i \ |
Archives