summaryrefslogtreecommitdiff
path: root/x11-libs/fltk
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-11-18 10:15:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-11-18 10:15:03 +0000
commitb284a3168fa91a038925d2ecf5e4791011ea5e7d (patch)
tree16fe44748708acacd909d4e2e160a09a7f6d936a /x11-libs/fltk
parent77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff)
gentoo resync : 18.11.2019
Diffstat (limited to 'x11-libs/fltk')
-rw-r--r--x11-libs/fltk/Manifest12
-rw-r--r--x11-libs/fltk/files/fltk-1.3.5-cmake.patch33
-rw-r--r--x11-libs/fltk/files/fltk-1.3.5-optim.patch11
-rw-r--r--x11-libs/fltk/fltk-1.3.3-r3.ebuild1
-rw-r--r--x11-libs/fltk/fltk-1.3.4.ebuild1
-rw-r--r--x11-libs/fltk/fltk-1.3.5-r4.ebuild (renamed from x11-libs/fltk/fltk-1.3.5-r2.ebuild)9
-rw-r--r--x11-libs/fltk/fltk-1.3.9999.ebuild11
-rw-r--r--x11-libs/fltk/fltk-1.4.9999.ebuild11
8 files changed, 67 insertions, 22 deletions
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index e5b1e6b183c1..7d86b9c66d30 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -10,13 +10,15 @@ AUX fltk-1.3.3-visibility.patch 781 BLAKE2B 7e909b6ec4ac6d915ac7dbab69a86b63166d
AUX fltk-1.3.3-xutf8-visibility.patch 4557 BLAKE2B 963c2dbc5d5466d3b5c35b411d53a59d4c8f08b186e9f14b67c5945ea3356ca697c804587b291fdee57c432d738106134dc12158230cc6236f4836fb39dc7e2d SHA512 621cedd0cb4516169f1c87e3286cad3ca9d1685509c7e944e3077243fbee57809d61c734757994d104630cee658d9962dc934cda82932a05e8d80611a1d5ac4d
AUX fltk-1.3.4-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
AUX fltk-1.3.4-freetype_pkgconfig.patch 1008 BLAKE2B ea91b4cf2b1a4cb26d7cb58d58b39e1851428fb2eacb13a30027cd315a7bb9c23109bc9abed954267d3d94494389ea8aad078a0d502cd1080cffacabec3c458e SHA512 8c13464b28639ae641e23aea799e23bfb6a4253fd8341ad656231116939f312e85b1117037089acbfce88c43a50a368493f311353b14dc0938444d56f49464f4
+AUX fltk-1.3.5-cmake.patch 975 BLAKE2B d8f068c7773522683797e2ad2059019abdaff79b0457f376b7e856419d1b1f7132de2215fbfa32cb00c5216cc7dd8f52df31ddf8c035e7c723474a3ad3b328d9 SHA512 bf67629bbc7a00b6b10a59028b56b69bb253510d0dce63a530b622e8caf71a7e3d84fae2100ffcbf8207990f61031bc5c330a239dd928440825564a8cae102de
+AUX fltk-1.3.5-optim.patch 198 BLAKE2B 1fc6df1d2932d8c792802e437c60c6f02f9e50be5a997e60f2017796e0f5ec8c40886af1946c9269b0c5a2e8ca40be92dd499e373f02be6a62eb59d56c0d3993 SHA512 839cb0d543187bbaabb916eeb33a96e14808e65c7e6e1aaed61f33efa1f56857757f48d9b4852c711fb296c3e480175449dd0dc5167f589975220276d05e6a67
AUX fltk-1.3.9999-conf-tests.patch 2259 BLAKE2B cb689918b807d75401ad3621deed635a883629c1e52ad0f797d77fb9e04aa28c9e9331399543f7d7fb63ca150f91d17ad0f7e71afef4364c505bf143bf3a7973 SHA512 a7ffb1c82e9a2c7bcfc7ffc1bfbf9fbf40daf4c5ca1ccb20c6e6d901846636de4c9166de8a63e739a730f4dc28c4527bec2c7390828611dc0b00b6c3e547b72e
DIST fltk-1.3.3-source.tar.gz 4986376 BLAKE2B 866d26cd8d7d1e985010f7601598ec87b44674f55d019239ebc0cbf8d70e04d9d1bce7a7c8463740bcd4c4a8ffcc8ef5e44b3f0cb591358d53d513844605c868 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d
DIST fltk-1.3.4-source.tar.gz 5284217 BLAKE2B 87da82cd04abe81cf095b92b997d4ca0fb7d77fbbb5602848f88ad79e5e41c9bff64b7c948b408b83833fcb658c07b3fe487f55c30357484fab444faca7e990f SHA512 92c236e426ad9b2a2954a6fc401bc9bf4c4c46d47b08f8c9b879da6031ac158ef9b944f28a8bea64d18072d1af8ceaa09c00abebd745fb76dd628636424446c2
DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
-EBUILD fltk-1.3.3-r3.ebuild 3745 BLAKE2B 2b785dcb2bd7112890d513be341badf09d56ec16a731524cfc45be2b20abddac858e31967857c1f48637f306bd5a64b1e794222f2fb54d25b5997509b4d83efc SHA512 f21765b853bc29a3f109c50c016ae645c58895f615579155aa45dbea406c6bd2a98544d013e422caf454b94932c61f43539cfda1a67fb27ddefc8c229fe4cb39
-EBUILD fltk-1.3.4.ebuild 4303 BLAKE2B 6a26c5124a1d561cb7f5d22e0c38221ddbb856fea9ac63a03eb0ff044b20e8acdc66bf4fe1cbbbb220a033796373bd29e35078b6da58068008e9909c986e7906 SHA512 600f392abbdb238a832a56d94ab50b98f9af22f9c0c9579f85abe99ceb79183bae18fbb9ffe02dc70afcf4f880a659da5351c13af82a9d8014426681938c44b2
-EBUILD fltk-1.3.5-r2.ebuild 4498 BLAKE2B ee877a763a130b267001832989a21cfe12734b9d6c10ebae9f0a6cb1308f430aedf7e17097ef262e512e310d83ac10cd5fedf4d0895920b0c4b8c2ded2ad49e9 SHA512 19725c51df550bebeb00fe378be390ffeb26ba87179732ef748976c81732f6dd581a3c0dd64d2dc8241d5f2ad0bfdb8b5309a6296b9ef9146f12acf3f65ebc7c
-EBUILD fltk-1.3.9999.ebuild 4518 BLAKE2B 719dbc412a4d3aa880146f7bda2d0859b41c03d17495d18e4a8226b3e103864dd8aba4d152a21c5fe139635913e8e18b65a0f24db1ac4201d4b4f90ab4f204d4 SHA512 07a58a821c8389207fe726d17663c06b777ae03efed187c2a8ff6dddae5da8ad8ea5f60e971819d13c6734646a27c61f1cfa3f338df7009d954b8ab20ce580ba
-EBUILD fltk-1.4.9999.ebuild 4551 BLAKE2B 2432478df1311381e0268b6abd710ee63494af57c5d6defefd323ce7a226aff9904d88b858e183a58032e06cabeb5a409a524c74a58ff88366078e33fae99a1a SHA512 a15b3a9955f01cc00745698b12a6df6a67f12cb56cccf4706b1e409bf3bccf11b3672a8f6bca3ca95caff526a49dd1bba5702a4060fe0842f73146552243318f
+EBUILD fltk-1.3.3-r3.ebuild 3775 BLAKE2B 473dbdb2628cce6ec66ad687c95f68d006f39aac41ad0565c67403fd1fc9991e35ad01bd3e36d2fa111b6fa84f4d314019ba05a2c9278a98d3666d05aab6b076 SHA512 b33cfbd9e53888a2cda5a484de729e8e499d0a1e1e8cc9b98e254cc3029714c6e2a3f1c0aac691385abe3813ed64ace1f3d3f79ed0bb6068f07249086dc48d54
+EBUILD fltk-1.3.4.ebuild 4333 BLAKE2B 7853f3c29261e27b6aeab227e6d4ddd39d2e0ce297e8e5edea33b17a32ce72af6d8d055c9c5cc2d97a33b65b50ce77af354a0605f0adfa1fc285dd36468e6793 SHA512 58b6eaa0c0bfce02860eb05cf853c123664ce5aeef2dc6d7dd81b0023f26a97337a24c204f72c296010da58fef56378151378980d05d158eed5c8ecf4cbcc6dd
+EBUILD fltk-1.3.5-r4.ebuild 4462 BLAKE2B 9d21882239323eb77450d589f90ad789e88db8f9c9d17a19911353f579331407be1f4ec1aa6b32cc0a003cf2e11dba2056ab44526f6e06feadf609d35cbd730b SHA512 c34b4d94927cdd7478d1a0ead2353b49aa4bc5f6561a74a4db76e2cdc06e96355655839472a2ca7a637f2a83d463cab43fc09983dca3774ddc97640dd0a5f496
+EBUILD fltk-1.3.9999.ebuild 4490 BLAKE2B 16fc1991447c30a8053dea7e332b0042c57c3226ca32be52fb65b73b8bb98f48d67d165bc3b3704dfaa11982e07f6b0ef0db7205bea6409f24eae91dac147f0d SHA512 4a848b42926be713e6fbbe606c7f4a06cd0b6d5e578c18ac9567390b1cb6e91b7c65d2ea0e4713c63e4dc5416198d278d19f8d0ecc8812d119cc84c0b3f3e1a4
+EBUILD fltk-1.4.9999.ebuild 4523 BLAKE2B f891f1268cb60fd616b169ffe0e92c5de5f025c0d7461a2702cff871f4a211ff4c953f125a2858879a4ee3ba0f584292da0f35a4397f5c9cd82d3b218d743505 SHA512 1d1001bd02f51d6bc8e24224ed71a60ef29117080c016c5d64db3a6acb85a35217c06c317d5e410b86e18e1aedda85f0897d37840345f1ed8346d8ba364f55a0
MISC metadata.xml 698 BLAKE2B 5289c4920b3345c4cfb1bd9151974c40b6d45f6ec605c7c1d766ed3c5118d562d645094ea64b4b0baeb83cf7872ff1fe762e0a427d53899b3d8f517233a9665f SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f
diff --git a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
new file mode 100644
index 000000000000..1eac250248d2
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch
@@ -0,0 +1,33 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -57,6 +57,7 @@
+ FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
+ FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0
+ FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION}
++FLTK_VERSION_FULL=${FL_VERSION}
+
+ AC_SUBST(FL_MAJOR_VERSION)
+ AC_SUBST(FL_MINOR_VERSION)
+@@ -64,6 +65,7 @@
+ AC_SUBST(FL_DSO_VERSION)
+ AC_SUBST(FL_ABI_VERSION)
+ AC_SUBST(FL_VERSION)
++AC_SUBST(FLTK_VERSION_FULL)
+
+ AC_SUBST(ARCHFLAGS)
+ AC_SUBST(OPTIM)
+@@ -1576,10 +1578,13 @@
+ BINARY_DIR=
+ AC_SUBST(BINARY_DIR)
+
++INCLUDE_DIRS="${includedir}"
++AC_SUBST(INCLUDE_DIRS)
++
+ dnl Write all of the files...
+ AC_CONFIG_HEADER(config.h:configh.in)
+ AC_CONFIG_HEADER(FL/abi-version.h:abi-version.in)
+-AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])
++AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile CMake/FLTKConfig.cmake])
+ AC_OUTPUT
+
+ dnl Make sure the fltk-config script is executable...
diff --git a/x11-libs/fltk/files/fltk-1.3.5-optim.patch b/x11-libs/fltk/files/fltk-1.3.5-optim.patch
new file mode 100644
index 000000000000..4d1512d749dd
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.5-optim.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1265,7 +1265,7 @@
+ if test "x$with_optim" != x; then
+ OPTIM="$with_optim $OPTIM"
+ else
+- OPTIM="-Os $OPTIM"
++ OPTIM=" $OPTIM"
+ fi
+ fi
+
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
index aaa5aa2bbd5b..74e6007fed11 100644
--- a/x11-libs/fltk/fltk-1.3.3-r3.ebuild
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
x11-libs/libXext
x11-libs/libXt
cairo? ( x11-libs/cairo[X] )
+ games? ( !sys-block/blocks )
opengl? ( virtual/glu virtual/opengl )
xft? ( x11-libs/libXft )
xinerama? ( x11-libs/libXinerama )
diff --git a/x11-libs/fltk/fltk-1.3.4.ebuild b/x11-libs/fltk/fltk-1.3.4.ebuild
index 14c0aafdc533..b1dbc2b941e3 100644
--- a/x11-libs/fltk/fltk-1.3.4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.4.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXt[${MULTILIB_USEDEP}]
cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+ games? ( !sys-block/blocks )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
diff --git a/x11-libs/fltk/fltk-1.3.5-r2.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index 1a7a9638b198..7af2106929bc 100644
--- a/x11-libs/fltk/fltk-1.3.5-r2.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXt[${MULTILIB_USEDEP}]
cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+ games? ( !sys-block/blocks )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
@@ -62,6 +63,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
"${FILESDIR}"/${PN}-1.3.3-visibility.patch
"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+ "${FILESDIR}"/${PN}-1.3.5-cmake.patch
+ "${FILESDIR}"/${PN}-1.3.5-optim.patch
)
src_prepare() {
@@ -76,10 +79,6 @@ src_prepare() {
-e "/^docdir/s:fltk:${PF}/html:" \
-e "/SILENT:/d" \
makeinclude.in || die
- sed -e "s/7/${PV}/" \
- < "${FILESDIR}"/FLTKConfig.cmake \
- > CMake/FLTKConfig.cmake || die
- sed -e 's:-Os::g' -i configure.ac || die
# also in Makefile:config.guess config.sub:
cp misc/config.{guess,sub} . || die
@@ -158,7 +157,7 @@ multilib_src_install() {
multilib_src_install_all() {
for app in fluid $(usex games "${FLTK_GAMES}" ''); do
dosym \
- /usr/share/icons/hicolor/32x32/apps/${app}.png \
+ ../icons/hicolor/32x32/apps/${app}.png \
/usr/share/pixmaps/${app}.png
done
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index f5904db08e28..f8b095c4b45d 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -25,6 +25,7 @@ RDEPEND="
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXt[${MULTILIB_USEDEP}]
cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+ games? ( !sys-block/blocks )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
@@ -62,6 +63,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.3.9999-conf-tests.patch
"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
"${FILESDIR}"/${PN}-1.3.3-visibility.patch
+ "${FILESDIR}"/${PN}-1.3.5-cmake.patch
+ "${FILESDIR}"/${PN}-1.3.5-optim.patch
)
pkg_setup() {
@@ -86,10 +89,6 @@ src_prepare() {
-e "/^docdir/s:fltk:${PF}/html:" \
-e "/SILENT:/d" \
makeinclude.in || die
- sed -e "s/7/${PV}/" \
- < "${FILESDIR}"/FLTKConfig.cmake \
- > CMake/FLTKConfig.cmake || die
- sed -e 's:-Os::g' -i configure.ac || die
# also in Makefile:config.guess config.sub:
cp misc/config.{guess,sub} . || die
@@ -151,7 +150,7 @@ multilib_src_install() {
if multilib_is_native_abi; then
emake -C fluid \
- DESTDIR="${D}" install-linux
+ DESTDIR="${D}" install-linux install
use doc &&
emake -C documentation \
@@ -166,7 +165,7 @@ multilib_src_install() {
multilib_src_install_all() {
for app in fluid $(usex games "${FLTK_GAMES}" ''); do
dosym \
- /usr/share/icons/hicolor/32x32/apps/${app}.png \
+ ../icons/hicolor/32x32/apps/${app}.png \
/usr/share/pixmaps/${app}.png
done
diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index 11e65454e793..7940dc7b3efe 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXt[${MULTILIB_USEDEP}]
cairo? ( x11-libs/cairo[${MULTILIB_USEDEP},X] )
+ games? ( !sys-block/blocks )
opengl? (
virtual/glu[${MULTILIB_USEDEP}]
virtual/opengl[${MULTILIB_USEDEP}]
@@ -66,6 +67,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.3.0-share.patch
"${FILESDIR}"/${PN}-1.3.3-makefile-dirs.patch
"${FILESDIR}"/${PN}-1.3.4-conf-tests.patch
+ "${FILESDIR}"/${PN}-1.3.5-cmake.patch
+ "${FILESDIR}"/${PN}-1.3.5-optim.patch
)
pkg_setup() {
@@ -90,10 +93,6 @@ src_prepare() {
-e "/^docdir/s:fltk:${PF}/html:" \
-e "/SILENT:/d" \
makeinclude.in || die
- sed -e "s/7/${PV}/" \
- < "${FILESDIR}"/FLTKConfig.cmake \
- > CMake/FLTKConfig.cmake || die
- sed -e 's:-Os::g' -i configure.ac || die
# also in Makefile:config.guess config.sub:
cp misc/config.{guess,sub} . || die
@@ -155,7 +154,7 @@ multilib_src_install() {
if multilib_is_native_abi; then
emake -C fluid \
- DESTDIR="${D}" install-linux
+ DESTDIR="${D}" install-linux install
use doc &&
emake -C documentation \
@@ -170,7 +169,7 @@ multilib_src_install() {
multilib_src_install_all() {
for app in fluid $(usex games "${FLTK_GAMES}" ''); do
dosym \
- /usr/share/icons/hicolor/32x32/apps/${app}.png \
+ ../icons/hicolor/32x32/apps/${app}.png \
/usr/share/pixmaps/${app}.png
done
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 17:42:54 +0000