Convert sed script to patch. Make xutf8 functions visible (bug #536842 by Toralf Förster).

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 199 insertions, 12 deletions

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index 27a1576e1258..5b1865ac1ca5 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.247 2015/01/19 12:01:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.248 2015/02/16 13:21:27 jer Exp $
+
+*fltk-1.3.3-r3 (16 Feb 2015)
+
+  16 Feb 2015; Jeroen Roovers <jer@gentoo.org> -fltk-1.3.3-r2.ebuild,
+  +fltk-1.3.3-r3.ebuild, +files/fltk-1.3.3-fltk-config.patch,
+  +files/fltk-1.3.3-xutf8-visibility.patch:
+  Convert sed script to patch. Make xutf8 functions visible (bug #536842 by
+  Toralf Förster).
 
 *fltk-1.3.9999 (19 Jan 2015)
 
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index ef2e76816cef..98c2a6c0c0a5 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -9,18 +9,20 @@ AUX fltk-1.3.2-conf-tests.patch 2259 SHA256 f309d0871780ebb830ede6dfc99c660eb488
 AUX fltk-1.3.2-desktop.patch 456 SHA256 6e519612de37f4cea83bded50dc3bf856c13af53da108def188a5edcbf3d506f SHA512 405b604471f86d2eb013b1e7ee2d73574cb322ee3e519092c984bbb0fe46cf2438762c63ff6a1c31467e92257dc84fa4d1725ff50238379273ca28c687f1bc13 WHIRLPOOL 613bd7ae2ba18f3d68fedb9bd32a771a8b242395d494ac139c26da9175ccb454f24baad1d4715fed7f369a3e0ae73f1ab1d7811e270d0fe3061df8dd3bf6ca11
 AUX fltk-1.3.2-jpeg-9a.patch 583 SHA256 5dd7ddcf9c393e0d73f361a06e190e1abcb9b2c1fd04753cae03a3dac8da1c96 SHA512 faf615c5f65e4f0ffbe6131469a971fc60bb1c376d71c59182d406b8481c55ff4e5264dac168a9cd1164b00b86678fb7141b119f91dee83307eb7ee6522a35ee WHIRLPOOL 31d4729b1aa5eb1aa32df453a589a1c23f50d96889e04992338d7ee0ddec5dc75287833ed8956e052ae026997a0a7c059f8e0cbbdceef4e8a6143380d022e6c2
 AUX fltk-1.3.3-fl_open_display.patch 210 SHA256 11eed0cdbd45e458f1bee8394fe3bc0280599b7bf5d2f7919976614c032325f1 SHA512 902d69af29fa08dbb85ecadc709ea4c5999bee5d0acbb6338b62e2f561ae3baa90350fbd92c16791a58858635ffbdf9cc6512c54712abd1e2700f633122e082d WHIRLPOOL 946d06fd2d7acd6888f897da5d854b510c3d22bb2d88efecc75118580c652fa6df00c2b912b9a891cf00db7e367aa4eccb2215caf394315cfeaffa7efb012bc9
+AUX fltk-1.3.3-fltk-config.patch 374 SHA256 17761c16c4e552cc85ed64b75d32d0c58121a9311b6eeb9ea6a37e50b17c7593 SHA512 1e7bc815aed18708d7e7450079c9cb8d972b5d0f306bd665e0b89c4d108a7e8a21375e5ec1a5ef11114995d6a7997071040a76c4bfbb7b61a3e22f34be73b914 WHIRLPOOL 1fbf33ef88f4193f1668c07281b732119f9eebc71202ba80f00b7bdb05b9b62122b25da2bc895efbb5adf0dd89caf3b07fda5af26e67f58dc5bacb1761fd53f8
 AUX fltk-1.3.3-visibility.patch 781 SHA256 c54ce62b3b80837a422d938358c361082e7d006b5f3da21e344aa891ebfacc03 SHA512 b9bf0ba24d27210702a98da3e5dbd4db7a36301a163ed8214362aaaa218bcc184d708fe1e249b5be4fd35e481dc5b85b2bf11db3e005436e57ad4436da2819df WHIRLPOOL ece85f4d9789a80ea43dd6c9bc387dce0394bcdc80c94ed203f29f849a44a4ca637b90c7de72d0ce410ff879ce28b04e0815b77a3ce623211f2a07c446ef201d
+AUX fltk-1.3.3-xutf8-visibility.patch 4557 SHA256 b60f372e22e139219caf0a2d11a099b83f3cfbbad0edfac033e1452798d26b9e SHA512 621cedd0cb4516169f1c87e3286cad3ca9d1685509c7e944e3077243fbee57809d61c734757994d104630cee658d9962dc934cda82932a05e8d80611a1d5ac4d WHIRLPOOL 9d4b92f67e29756cf8382a917f3ff1bd96b879033ece5195bf7d6dbf9c93bebd953136a77594b2a24463566124b524d4b91851eda4a8df2a57d46e93551ad56c
 DIST fltk-1.3.2-source.tar.gz 4260874 SHA256 176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4 SHA512 9372a34d8dfc4b4ece7632683c1c92f9ea9e538ba6eec08bec69615e2b2c885957d229a5ec495830f673b6a059f55a94b61727e8eb1fb7b3bd37005dc0b8312e WHIRLPOOL 10c85d1ae50ccd3d9f66285483d39bc0e61b9f3306f87412841ceed9a45fd45f0476b28f7e7652658f6fcc48533d1ec4974a9eb98ca0f535b662a70209c1f781
 DIST fltk-1.3.3-source.tar.gz 4986376 SHA256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d WHIRLPOOL 876a92e44dac20e6a2d86e4339a87185e708718d4cc59983bd81d5c3f0100d52230ef34d9c92800a2a07f6e7ed26e2ba9212c01ce898e7a184a7a35c40837761
 EBUILD fltk-1.3.2.ebuild 3667 SHA256 2f6dafa4899ec2c5512925f09a8cbe2fcc70fb4086aef380d8a3b7958eefa77b SHA512 0725a2cf279f964295e16b29d1eab5d8653553d6499ac4f8a8e970e4a75f701b1593df8a1c271456e8e66d27506a30c1d9949f8cf0c33c7140d8ea0f54f49bfb WHIRLPOOL cb605e2d62a4980110402f6f2d212e60ee4f017d3eb0da998cebb5e8f71f086d5bd7a41aa7bb9f5c9d1ad01b35d2c3623c8c6bdf118e6267ed217ac317b22a23
-EBUILD fltk-1.3.3-r2.ebuild 4058 SHA256 f23d1db70ffb080d28eab2411cc3f88941f8d2f233b3603d319e56992e442f7a SHA512 6edf3066fc6c1d20da9e822a25aa5efdc58bc2fffb1eead169e8b7683890a78416ebe28546bbadc1d7570a0b74806fae221d3fe863c7652050bb73ea0919eb72 WHIRLPOOL 815388bf4e1efb0618fd82d4f70e7299c1a0655e6bf42e8be86824f77c43b45648be4a8da427e9850433a237a3c405b573cfea2f12f1927755894a3f599e9017
+EBUILD fltk-1.3.3-r3.ebuild 4049 SHA256 628db96fe23b2367b9101f743502bd0d8398ab06973b03140521b9cc1ce09287 SHA512 7c38c032efbcc2cd72395955e1542e164316192916e86061b3fd53854cad696ea9fd40885150f53291599edd1a5fa6724cccd1e438c50e4c458e9d0ddf958420 WHIRLPOOL 397c4f19f773e595628dddcc21f8c08bf1102f39dc19d485b4bd2bc474609a27bbb55a2c5ff9017a3ce655066fffa1d3cdde28ea022b4fe554f2afd44ccaa50e
 EBUILD fltk-1.3.9999.ebuild 3953 SHA256 b7ada8aeddc3669cfe721d6435f68a7a1bc528d6785a3cc3b019eb6a4cd58bc3 SHA512 0156c56357c3dafce1dbdebc348d19de7131bc8c6ce9392b9177ccf9c8e651b6870a9e57383264ee963e072f4bdb4dcf5790f00a3e1cc27cb0ab031ee6f8991e WHIRLPOOL 21869a4981e8db849c42ecf9bf102e791fce914d905a79556bff848d576bf9a2cb3cd02ec74e13134f3099b21f3624f44594c79ddb7e8d88a096e7c1ca84b6d3
-MISC ChangeLog 34514 SHA256 688bb949575eb1a63f1c33148e78135860a2cdfbad974f2e69000ba4808f9109 SHA512 a90feefa1399e9fbd3d136ebb00a7f1ba421e6596d6a433ef87d52b5081d506bef46a56fa3cdf9b17698c72d9d0102698fe4c5321819c7541a75234f8d3243bd WHIRLPOOL 833420a7ea2482524f0a06164a2becbe06cccb53c42af9a3cee539d9d0a7295ad57595775f47ab6ac084069f032f4f70a7a834617048f9fc3e2e7f67bc2b9a75
+MISC ChangeLog 34817 SHA256 1a47cc6cae88f2eda29719fb09df0b546bd83ef6aeb84fb8d0927c3e0aeb445d SHA512 c836da88a8ef1898ccbf41ab1b89a38c462c6ec840f7ddcdf18fe714f5c309eb06afafeb84f40300ab021e1f7adbf31ca3dea9c28217940b5d982ab7304ccc36 WHIRLPOOL 8e6a7b79f21b43691f768fe4a46c6ae4f357c1239f008b434fc9fd04fa98f187a80f600bef5230be0ed45d27a99d9c8d13d5bca943a710fa3e30f87fab8ed68a
 MISC metadata.xml 589 SHA256 46e3321a6cd7d0a7a4810a9db46b9d45fdc2bf72ae8ada22b9b37438c1a6b7f5 SHA512 d346f5c21cba93ebe8b86091483aae647d4f84913c886bcf59d6e75b2a1dee3dbd76313f590f86ccec01195cea6ed40ec22240ee530921f3490f786263f4b65c WHIRLPOOL c46e8e6f6b98c8caf2cc41773582e0fe6be822cd55acc89ee8f8f0e3716841ab64553cfbde024c782194bd3b45c04535903859f2eeb0d987b4e7708d5567067b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS88icACgkQVWmRsqeSphNtKgCcCS49UAobq5L+zfxvGNdNhFPL
-NUYAn3iaL+NigNQJn6SVZVESnbFL1CbH
-=tp8P
+iEYEAREIAAYFAlTh7tgACgkQVWmRsqeSphPxVACfYI9W3FseJ0OCesSvGMl/hMgh
+sjAAnRu8jVYraMuvccxaGAP+UUpbDKX0
+=uB6c
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch b/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch
new file mode 100644
index 000000000000..ca7607afa4fc
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch
@@ -0,0 +1,14 @@
+--- a/fltk-config.in
++++ b/fltk-config.in
+@@ -42,9 +42,8 @@
+ 
+ # flags for C++ compiler:
+ ARCHFLAGS="@ARCHFLAGS@"
+-CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
+-CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
+-LDFLAGS="@LDFLAGS@"
++CFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@"
++CXXFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@"
+ LDLIBS="@LIBS@"
+ OPTIM="@OPTIM@"
+ CAIROFLAGS="@CAIROFLAGS@"
diff --git a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
new file mode 100644
index 000000000000..f30105e18c06
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
@@ -0,0 +1,165 @@
+--- a/src/xutf8/utf8Input.c
++++ b/src/xutf8/utf8Input.c
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ #include "../Xutf8.h"
++#include "../../FL/Fl_Export.H"
+ #include <X11/X.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+@@ -53,7 +54,7 @@ typedef struct {
+ #include "lcUniConv/jisx0212.h"
+ #include "lcUniConv/ksc5601.h"
+ 
+-static int
++FL_EXPORT static int
+ XConvertEucTwToUtf8(char* buffer_return, int len) {
+   /* FIXME */
+ #if HAVE_LIBC_ICONV
+@@ -120,7 +121,7 @@ XConvertEucTwToUtf8(char* buffer_return,
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertEucKrToUtf8(char* buffer_return, int len) {
+   int i = 0, l = 0;
+   char *buf;
+@@ -160,7 +161,7 @@ XConvertEucKrToUtf8(char* buffer_return,
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertBig5ToUtf8(char* buffer_return, int len) {
+   int i = 0, l = 0;
+   char *buf;
+@@ -189,7 +190,7 @@ XConvertBig5ToUtf8(char* buffer_return,
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertCp936extToUtf8(char* buffer_return, int len)
+ {
+   int i = 0, l = 0;
+@@ -226,7 +227,7 @@ XConvertCp936extToUtf8(char* buffer_retu
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertGb2312ToUtf8(char* buffer_return, int len) {
+   int i = 0, l = 0;
+   char *buf;
+@@ -261,7 +262,7 @@ XConvertGb2312ToUtf8(char* buffer_return
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertEucCnToUtf8(char* buffer_return, int len) {
+   int i = 0, l = 0;
+   char *buf;
+@@ -300,7 +301,7 @@ XConvertEucCnToUtf8(char* buffer_return,
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertEucJpToUtf8(char* buffer_return, int len) {
+   int i = 0, l = 0;
+   char *buf;
+@@ -373,7 +374,7 @@ XConvertEucJpToUtf8(char* buffer_return,
+   return l;
+ }
+ 
+-static int
++FL_EXPORT static int
+ XConvertEucToUtf8(const char*	locale,
+ 		  char*		buffer_return, 
+ 		  int		len, 
+@@ -408,7 +409,7 @@ XConvertEucToUtf8(const char*	locale,
+   return len;
+ }
+ 
+-int
++FL_EXPORT int
+ XUtf8LookupString(XIC                 ic,
+ 		  XKeyPressedEvent*   event,
+ 		  char*               buffer_return,
+--- a/src/xutf8/utf8Utils.c
++++ b/src/xutf8/utf8Utils.c
+@@ -21,6 +21,7 @@
+ #if !defined(WIN32) && !defined(__APPLE__)
+ 
+ #include "../Xutf8.h"
++#include "../../FL/Fl_Export.H"
+ 
+ /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
+ 
+@@ -29,7 +30,7 @@
+  * Returns the byte length of the converted UTF-8 char 
+  * Returns -1 if the UTF-8 string is not valid 
+  */
+-int
++FL_EXPORT int
+ XConvertUtf8ToUcs(const unsigned char     *buf,
+ 		  int                     len,
+ 		  unsigned int         	  *ucs) {
+@@ -137,7 +138,7 @@ XConvertUcsToUtf8(unsigned int 	ucs,
+  * returns the byte length of the first UTF-8 char 
+  * (returns -1 if not valid) 
+  */
+-int
++FL_EXPORT int
+ XUtf8CharByteLen(const unsigned char     *buf,
+ 		 int                     len) {
+   unsigned int ucs;
+@@ -165,7 +166,7 @@ XCountUtf8Char(const unsigned char 	*buf
+ /* 
+  * Same as XConvertUtf8ToUcs but no sanity check is done.
+  */
+-int
++FL_EXPORT int
+ XFastConvertUtf8ToUcs(const unsigned char     *buf,
+ 		      int                     len,
+ 		      unsigned int            *ucs) {
+--- a/src/xutf8/utf8Wrap.c
++++ b/src/xutf8/utf8Wrap.c
+@@ -20,6 +20,7 @@
+ #if !defined(WIN32) && !defined(__APPLE__)
+ 
+ #include "../Xutf8.h"
++#include "../../FL/Fl_Export.H"
+ #include <X11/Xlib.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+@@ -705,7 +706,7 @@ XUtf8_measure_extents(
+ /*****************************************************************************/
+ /** returns the pixel width of a UTF-8 string				    **/
+ /*****************************************************************************/
+-int
++FL_EXPORT int
+ XUtf8TextWidth(XUtf8FontStruct 	*font_set,
+ 	       const char 	*string,
+ 	       int 		num_bytes) {
+@@ -815,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct 	*font_se
+ /*****************************************************************************/
+ /**  get the X font and glyph ID of a UCS char                              **/
+ /*****************************************************************************/
+-int
++FL_EXPORT int
+ XGetUtf8FontAndGlyph(XUtf8FontStruct  *font_set,
+ 		     unsigned int     ucs,
+ 		     XFontStruct      **fnt,
+@@ -886,7 +887,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct  *f
+ /*****************************************************************************/
+ /** returns the pixel width of a UCS char				    **/
+ /*****************************************************************************/
+-int
++FL_EXPORT int
+ XUtf8UcsWidth(XUtf8FontStruct  *font_set,
+ 	      unsigned int     ucs) {
+ 
diff --git a/x11-libs/fltk/fltk-1.3.3-r2.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index 296936a92c26..3ae5168f0f14 100644
--- a/x11-libs/fltk/fltk-1.3.3-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.3-r2.ebuild,v 1.2 2015/01/14 09:21:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.3-r3.ebuild,v 1.1 2015/02/16 13:21:27 jer Exp $
 
 EAPI=5
 
@@ -50,14 +50,12 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
 		"${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
 		"${FILESDIR}"/${PN}-1.3.3-visibility.patch \
-		"${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch
+		"${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch \
+		"${FILESDIR}"/${PN}-1.3.3-fltk-config.patch \
+		"${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
 
 	sed -i \
 		-e 's:@HLINKS@::g' FL/Makefile.in || die
-	sed -i \
-		-e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
-		-e '/^LDFLAGS=/d' \
-		"${S}/fltk-config.in" || die
 	# some fixes introduced because slotting
 	sed -i \
 		-e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \