Fix compability with fltk-1.3.0 wrt #351894 by Peter Ruskin and Yury Fedorchenko

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

4 files changed, 113 insertions, 17 deletions

diff --git a/net-print/xpp/ChangeLog b/net-print/xpp/ChangeLog
index b70dfc8256f2..df10baa062f2 100644
--- a/net-print/xpp/ChangeLog
+++ b/net-print/xpp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/xpp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.23 2011/06/02 19:14:36 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/ChangeLog,v 1.24 2011/12/10 14:10:53 ssuominen Exp $
+
+*xpp-1.5-r1 (10 Dec 2011)
+
+  10 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +files/xpp-fltk-1.3.0.patch, +xpp-1.5-r1.ebuild:
+  Fix compability with fltk-1.3.0 wrt #351894 by Peter Ruskin and Yury
+  Fedorchenko
 
   02 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> xpp-1.5.ebuild:
   Make build again, EAPI bump, no prestripped files (bug 252030)
diff --git a/net-print/xpp/Manifest b/net-print/xpp/Manifest
index 9c2d887403f9..807212a7928b 100644
--- a/net-print/xpp/Manifest
+++ b/net-print/xpp/Manifest
@@ -1,28 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX cups.diff 1254 RMD160 9ea69ce980bc1734ecbfabb9ffb6561d742291f2 SHA1 f30caaf6bf822655070dbeed604ca5faae9aee11 SHA256 4f15d4d53af3b10f889a196503e6c013dc01f93662bd1958e46ef0d7b71a788f
 AUX inputslider.h.patch 622 RMD160 77f0ced592ddf6d77d806ffe1b8f87cd5339d47b SHA1 b823be889c91271012062e31cd1f55e895e407af SHA256 4a8babc92dc06d5aca33b4267c95b7e5cf5b83133a3d85744ce512836aa0dfd3
+AUX xpp-fltk-1.3.0.patch 1012 RMD160 90812a8730e9e2a8615bbdc6e06c5e4eb8c09b4a SHA1 0bdf8f60bfe4f68966f20d3a1d9bd4f59015e9f7 SHA256 b63c4a9a7302cb9e1e62edaf028ef1e225a6ac49f2de801808f57dedc1ccbbb7
 AUX xpp-gcc4.patch 495 RMD160 8ec96cb332954380a3040915a6748311ad6c0d7c SHA1 ecf24161a4b276f7fc36e88610be5351bf06360d SHA256 0a3af70845f496e929537d2ebe011291e98d34b15bc90d6b09d9920e6ec06267
 AUX xpp-glibc-2.10.patch 368 RMD160 3327f4c12d525f5857cc67327d34f73c38e3f641 SHA1 e186e630873fb15a032572d61e20294e6175bd10 SHA256 072349dca84c0c956235e4f8c5d78d579da94be1dbdf2ea4a37bb2b9335b96ae
 DIST xpp-1.5.tar.gz 107755 RMD160 a64ec4c93013d1db08a6c9b6705b43850c36c337 SHA1 7f3c1427979516e47402a0acb708eb83b68daa61 SHA256 4d5b0c5467b10ababa4304c2fabf3f8cc7b715cc6a6a4844dc735bd7678a845d
+EBUILD xpp-1.5-r1.ebuild 987 RMD160 5fdb1089dcfc4e8c3a00f087ab98ec8245acce38 SHA1 c7a21008e0e3dd8114fd03503b883b318a136023 SHA256 2c8160c24dbddb636903e8b4f3dd492b3ce841600fbe5666d712ccda67d9e8da
 EBUILD xpp-1.5.ebuild 953 RMD160 b5ed28fb210c937693e04fbef29f15a52b1e25b6 SHA1 675b08b99f40e08b3523b569090dde416e151b7e SHA256 3d7e815e2a7ef0ee13cf95e874b11dd8f0bdbc7f5f3aa0ff668ba4be686ba76c
-MISC ChangeLog 3246 RMD160 bdda669c6825956d3a8dfd2319bc42dc3557b52c SHA1 c252041f9c0e670b5af2ad949a8bc7dc304cdfc6 SHA256 6781d0126fdf2cf3966545e89544c694a9a7e89643dfcd6d102953b7f93a8da1
+MISC ChangeLog 3464 RMD160 74199eed316bf578082edbf34cf815a04bd5626a SHA1 569063f3cbfe0cc3f75aee115b970ec2967bea0f SHA256 99eb66876ad8a292a1f50a32665f1a8e19b5bc2051e409aa3cf6c1270e0afffa
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN5+EhAAoJENwGBM22xffeCEAQAKYGCEYDTZLmxkihQ5lS+jEt
-zRC4fsBF2pKBv2weSAhlHN7M5ptFtPXjHes6vV5w6GiHL+2xPsIFqTzHaqie5lJE
-zObRwJT38+4CKlWKG7dWgm0RTZmp6yQKWMKK6HJpb+Cc8/lCcQIw4xD6vSP3q9sC
-6AxtQ3iXhMCnWWRGSkncefUI/OyJN0BCI62J8b5FA1+a720d30Lhwntsv1B7cNc8
-+RbmGbMHspf2JhqnHsvM5LCPfXGEO3dqDrajtfOiTwSesE80zsFeZ/kRP8W7DsyC
-W4qnqWGKclMsNrmb9DU+yFDpkh/rXZRTHgMHEluL61RVGbpdovUK5r8ix8m7yfMM
-Juy6qATz9Wy/e15jRQPy11vwes2Ghh3y9SwA9q+GCZGOcYqeyyk0oByUjT97col8
-Aqw73YaaRnvNruLs5O0uzeieTE4/U8qgdrEOjTu4lwLz+A+Nfm04NZMtaB8LQwFN
-DYagUlMG0QM/XPnwsCiCLiTY+PsOQy+9x356peQ3rGPRyN7Dj6zryJEC4R5Jdfn2
-6l687xFzcEBs9JXeRPQcC/R0BJtxAT9DrA5kB/183Bg3fZKsOq+wGbA0k9YhzyYM
-33jDDrqRTrPhOiM1bfyLgs9Lw4eRVVkqYpD579dUWpzm4jKPLLRp28uUfM5mbdWz
-uaULPty8R9Mrkwngl6yU
-=6RTx
+iQEcBAEBAgAGBQJO42hKAAoJEEdUh39IaPFNMv4H/0ncQ/wzVkt1QgZF3fQVnNuc
+3sbFoKIOxyi0fKMOL8PHvoy7RCXfWM2Iqsc83GzCmfC7zLTNqFC+Mm86vsppxt2d
+dsF3g0lqh5JYmVVnChm3mrADgMvTy6+6G/6r6kVAgKRiqDeBUyFDKPRb2XZK9kZH
+3Fm3uy/dfi3YfM56HO9pw+Npl66Nim1VrFJ7WckNNYPlrYzrKcOPKU66aXs14aSk
+H3oeFwcjUKKzbv1PdlSjCpxcYKwwfk+Bywp8O3oy+ElVp937/N0nWUObrOxQ5tYj
+Xa6eE0o5yMxeZLxOiRrFtUDZh/tgnoMQ3xAwoAEGUxQU4cBwRcsegci2I2PUYsQ=
+=Hhxo
 -----END PGP SIGNATURE-----
diff --git a/net-print/xpp/files/xpp-fltk-1.3.0.patch b/net-print/xpp/files/xpp-fltk-1.3.0.patch
new file mode 100644
index 000000000000..8b921b8d17e7
--- /dev/null
+++ b/net-print/xpp/files/xpp-fltk-1.3.0.patch
@@ -0,0 +1,44 @@
+http://bugs.gentoo.org/351894
+
+--- mainwindow.fl
++++ mainwindow.fl
+@@ -70,7 +70,7 @@
+   fileList->value(print->filelist);
+ }}
+           private xywh {440 75 65 25} down_box DOWN_BOX shortcut 0x80062 align 16
+-          code0 {\#include <FL/fl_file_chooser.H>}
++          code0 {\#include <FL/Fl_File_Chooser.H>}
+           code1 {\#include "xpp.h"}
+         }
+         Fl_Scroll printerList {
+--- xpp.cxx
++++ xpp.cxx
+@@ -2500,7 +2500,7 @@
+     // Redraw the destination menu in the main window
+ 
+     printerPack->parent()->redraw();
+-    printerPack->draw();
++    ((Fl_Widget*)printerPack)->draw();
+   
+   }
+ 
+@@ -2674,7 +2674,7 @@
+   // Redraw the destination menu in the main window
+ 
+   printerPack->parent()->redraw();
+-  printerPack->draw();
++  ((Fl_Widget*)printerPack)->draw();
+   
+   return(dest_index);
+ }
+--- xppmain.cxx
++++ xppmain.cxx
+@@ -32,7 +32,7 @@
+  */
+ 
+ #include "mainwindow.h"
+-#include <Fl/Fl_Shared_Image.h>
++#include <FL/Fl_Shared_Image.H>
+ 
+ /*
+  * 'main()' - Do all what xpp should do
diff --git a/net-print/xpp/xpp-1.5-r1.ebuild b/net-print/xpp/xpp-1.5-r1.ebuild
new file mode 100644
index 000000000000..abc4d3a29f15
--- /dev/null
+++ b/net-print/xpp/xpp-1.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5-r1.ebuild,v 1.1 2011/12/10 14:10:53 ssuominen Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="X Printing Panel"
+SRC_URI="mirror://sourceforge/cups/${P}.tar.gz"
+HOMEPAGE="http://cups.sourceforge.net/xpp/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="net-print/cups
+	>=x11-libs/fltk-1.3.0:1
+	virtual/jpeg
+	media-libs/libpng:0
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/xpp-gcc4.patch \
+		"${FILESDIR}"/xpp-glibc-2.10.patch \
+		"${FILESDIR}"/xpp-fltk-1.3.0.patch
+}
+
+src_configure() {
+	tc-export CXX
+	export LDFLAGS="-L/usr/lib/fltk-1 -lfltk"
+	export CPPFLAGS="-I/usr/include/fltk-1"
+
+	STRIP="$(type -P true)" econf
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	einstall
+	dodoc ChangeLog README
+}