Export Fl_XFont_On_Demand() (bug #529346).

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

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index d959cdcb2b3fe53cb72f5ca36753ba1b1438547f..e54f4f3629fd3ab665b7288907865bfbc07cf91f 100644 (file)
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.243 2014/11/19 14:06:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.244 2014/12/03 23:41:48 jer Exp $
+
+*fltk-1.3.3-r2 (03 Dec 2014)
+
+  03 Dec 2014; Jeroen Roovers <jer@gentoo.org> -fltk-1.3.3-r1.ebuild,
+  +fltk-1.3.3-r2.ebuild, files/fltk-1.3.3-visibility.patch:
+  Export Fl_XFont_On_Demand() (bug #529346).
 
 *fltk-1.3.3-r1 (19 Nov 2014)
 

diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 2c11973d0ecd27bffe23e708a4e3ada3dccbe889..52abfde9094745274e66b5dce8c42f9d6e00062c 100644 (file)
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -9,18 +9,18 @@ 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-visibility.patch 302 SHA256 ac6d73daadd6d0310e3cf32c4edac1c06f45334088d71c7a51720406b901e855 SHA512 f643b472f91972a49c3f2b7f7084d5f1ee2e4cbcca033226b03c516e6393341416f37e5b05ad2744ffb18581483a13ef052fcf62f1e8ebee70980d820b55fa72 WHIRLPOOL 8b34feb00a598afed90185ebfed82c00bf517cddb9342b37f064d8f22a8525dab485586d8fc154265b7ad9c9c026a25c4a53fc93ad7f0d83d33e1db9925cf5cb
+AUX fltk-1.3.3-visibility.patch 781 SHA256 c54ce62b3b80837a422d938358c361082e7d006b5f3da21e344aa891ebfacc03 SHA512 b9bf0ba24d27210702a98da3e5dbd4db7a36301a163ed8214362aaaa218bcc184d708fe1e249b5be4fd35e481dc5b85b2bf11db3e005436e57ad4436da2819df WHIRLPOOL ece85f4d9789a80ea43dd6c9bc387dce0394bcdc80c94ed203f29f849a44a4ca637b90c7de72d0ce410ff879ce28b04e0815b77a3ce623211f2a07c446ef201d
 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-r1.ebuild 3987 SHA256 7eed0de091f579040b336f966c78706f490cce5e958be0a80dbc48796e774c5a SHA512 cc5b929a69a3909cea23a017ceae9a219b02f081e3143dd77a3cb5b00b75f63b005da74b1de08f5acc759e29a9675cd9b6f8b8c9426607877cdbfe80375ea6b8 WHIRLPOOL 3eb02ed44609ffe51f8ae4c2180d2256358de0e76c99e541101c4cc9db5f7fba4cb8bbd961330d02375a496cd46bd148037e31421530e8cbebfd2b6d5af9fae4
+EBUILD fltk-1.3.3-r2.ebuild 3987 SHA256 76d88514ee4d125d467177925dd6dd11536d95d93e4a7d0c0ef7dfe0719727f3 SHA512 49b33f451c7257ee7d7563c22bed1a6bb2dfd8bd540a6cfc651c7fe589c45ff4dff04496e0ca9bbcc47b640a16a304cd430b97453f6a8c8c50ecf02f6c66b0e4 WHIRLPOOL db2c20130bc9197df314cbda762fbcd893d2337c112c6c0966d86684ebd172af5b383120aca8bac594977aad350d36370c99f0609d2c6a8825e4cd80d5d3cd34
 EBUILD fltk-1.3.3.ebuild 3932 SHA256 511938eafe41719ab5beec17a3e698c112b9dd075243a497662f0339e855a951 SHA512 fc2c0ae90a3a01e8cb7d7916bf842dc2fab0c71dab0f933117e5beffcd0f0c7c95d8f6f137f9ba129b1b1d2be06b61e7d63674200642fa2c570f6ff4917b83b4 WHIRLPOOL a65a62131ee54d167eccd44f895395355fa5d015504bc76a2546bcc7057587e329365d247f852c981d445da3f7e2609d681c595b9ac49b475d385b3333f4c2d2
-MISC ChangeLog 33990 SHA256 32eb7f6a6f97642ebb8254ad71d4d05ef7ef2d232e38cf79eeddb1ff6d89bfc3 SHA512 49f4354451baf051de2144ba315fdf1defaa8ccfbf00d57488c28bb0d90829a6743794771a90742301f717daf469acfaf14fd308f356a1d61627158f0ae82ac8 WHIRLPOOL 0d9ef8f8710d12462dde2606136ca3f720d2e86322ac69980da0d6c2456ca0d123f2be974fafeca393658d4f8c9b9c53fa93cdf3dd5e7e3c442fa5d0e7d35798
+MISC ChangeLog 34196 SHA256 2f85ee0187e60256d7ce4636dd0e0446f30849843d95b59b35ae7fbb01af1e4e SHA512 9d1fcbb118850ecb83bb00d3ddf4274b6d5311cc8777ce4e404168d5cd0c2112ae17465659cf686d56c5e09c2cb5b4914a24244a339166162f5b3b414c4f169f WHIRLPOOL 08ae61ec446e675adbcc252567434d723a63dbf8913ca0748d00988b68ab50588ec527b15989cf4b6612538ac26c2777727cf6438cc92553c5b7943145414bc5
 MISC metadata.xml 589 SHA256 46e3321a6cd7d0a7a4810a9db46b9d45fdc2bf72ae8ada22b9b37438c1a6b7f5 SHA512 d346f5c21cba93ebe8b86091483aae647d4f84913c886bcf59d6e75b2a1dee3dbd76313f590f86ccec01195cea6ed40ec22240ee530921f3490f786263f4b65c WHIRLPOOL c46e8e6f6b98c8caf2cc41773582e0fe6be822cd55acc89ee8f8f0e3716841ab64553cfbde024c782194bd3b45c04535903859f2eeb0d987b4e7708d5567067b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRspAAACgkQVWmRsqeSphMA7wCfd8NJM2htJ1+ffmljq73nbldP
-IX4AnjJsYqj40ZnWYLApKMh4GMlZS6pC
-=7Fgj
+iEYEAREIAAYFAlR/n70ACgkQVWmRsqeSphNfWQCfcjQNVw62znYAbdPKfQ1aQ31M
+WyUAnRyhP/UnjzS1UgkNT3ePVtch5lle
+=ldK7
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/fltk/files/fltk-1.3.3-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-visibility.patch
index 99831e8d68154bcf0fcd7556d3f20e4ede3e0213..491e0a18876dce9e22ca3f5d34e38badcd566179 100644 (file)
--- a/x11-libs/fltk/files/fltk-1.3.3-visibility.patch
+++ b/x11-libs/fltk/files/fltk-1.3.3-visibility.patch
@@ -9,3 +9,14 @@
  
  /**
      Sets the widget that will receive FL_KEYBOARD events.
+--- a/FL/x.H
++++ b/FL/x.H
+@@ -114,7 +114,7 @@ FL_EXPORT Fl_Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.
+ // With Xlib / X11 fonts, fl_xfont will return the current selected font.
+ // With XFT / X11 fonts, fl_xfont will attempt to return the bitmap "core" font most
+ // similar to (usually the same as) the current XFT font.
+-class Fl_XFont_On_Demand
++class FL_EXPORT Fl_XFont_On_Demand
+ {
+ public:
+   Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { }

diff --git a/x11-libs/fltk/fltk-1.3.3-r1.ebuild b/x11-libs/fltk/fltk-1.3.3-r2.ebuild
similarity index 97%
rename from x11-libs/fltk/fltk-1.3.3-r1.ebuild
rename to x11-libs/fltk/fltk-1.3.3-r2.ebuild
index 888218b09254921defbbc22039993876b018cae9..3f0b32e49b3e5d80739f3726e02cfad98a4e337f 100644 (file)
--- a/x11-libs/fltk/fltk-1.3.3-r1.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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-r1.ebuild,v 1.1 2014/11/19 14:06:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.3.3-r2.ebuild,v 1.1 2014/12/03 23:41:48 jer Exp $
 
 EAPI=5