summaryrefslogtreecommitdiff
path: root/x11-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-18 06:49:50 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-18 06:49:50 +0000
commit529bbf6d047ac6b80c0d9310ec0f666c145ec5fe (patch)
treeae415fb3fee6b16f7371a5d3597dcf98cca19b62 /x11-libs
parentec33f4bcbd3944dc39c56a98cde12232684932cf (diff)
gentoo auto-resync : 18:03:2024 - 06:49:50
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/Manifest.gzbin18012 -> 18012 bytes
-rw-r--r--x11-libs/fltk/Manifest14
-rw-r--r--x11-libs/fltk/files/fltk-1.4.9999-cmake.patch19
-rw-r--r--x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch42
-rw-r--r--x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch14
-rw-r--r--x11-libs/fltk/files/fltk-1.4.9999-optim.patch13
-rw-r--r--x11-libs/fltk/fltk-1.3.5-r4.ebuild5
-rw-r--r--x11-libs/fltk/fltk-1.3.8.ebuild5
-rw-r--r--x11-libs/fltk/fltk-1.3.9999.ebuild5
-rw-r--r--x11-libs/fltk/fltk-1.4.9999.ebuild14
-rw-r--r--x11-libs/fltk/metadata.xml3
11 files changed, 119 insertions, 15 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 219f07958d2d..c845f96e1787 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
Binary files differ
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index cbfa76e91ef7..808e939ed410 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -7,10 +7,14 @@ AUX fltk-1.3.5-AR.patch 291 BLAKE2B ffbca85e658a3e5615bd69ab10a6f2e740746fd2c56d
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
+AUX fltk-1.4.9999-cmake.patch 673 BLAKE2B 1332768f0a52f495e25c9b69b3c69cc94f986cd6a3a255df0405c3d069ae6ae8481a38b7d5dfbfa358172501db987b12e9978c2199a21d2b5f3974b235f343c2 SHA512 5851218248a15752cfa2b1759dd73843e9da9785c4ba7327126d62437e8497b23d6aa4a3a7d1b07a068de8be1b84d3fcbe4e1eb5c8ed50d9bb451ffbca942c5a
+AUX fltk-1.4.9999-conf-tests.patch 1799 BLAKE2B b5527fd6d2b43f26157d9c676908021b19adc54034f1f1f90be4cc05aefa0325e8e03fe2ce1d6d1bed286864bcf0846e6e5f19be846245f7e9f1c648ca34db20 SHA512 015aa4ab6394974995d20d358d25fb2569a1453a20f3d28636eddda7ee030ce97d002ed2b1c6d0c5234e67207e1c8b1c00577939215ee33509f84cab8339dd8e
+AUX fltk-1.4.9999-makefile-dirs.patch 369 BLAKE2B 103f9ea921257c99e6b08f03f8ad32869530f051bcc62434d285d5c9c87bcce362eb6f1889af2553086fed36d3d38791171f6722835a59df7162cd0715543fe9 SHA512 a7f12ef75c22670e83dc172a9ac669fb5584416c3457f4ff22d0da17f5c1b263e89020ab715b8b919f0dd3a128a6bfe611001f70077e166ab85721cea53810d1
+AUX fltk-1.4.9999-optim.patch 342 BLAKE2B d76931d951083fa76c60569508ef6726a1e9307f3fb5e901a4eca78eb4b6ef0a260feef9bd29f91e324281f2ded87decb21cdbde9c5078ecce7f9fa815ea8122 SHA512 8f2337014933ef1db03477d017dc3c905bf4d2cbc3e62e49e40a6d03b3f38fe00d38eb31912245555ac2e5a28580b38b22532797f237e43b5fe98e204428cd4c
DIST fltk-1.3.5-source.tar.gz 5261324 BLAKE2B df05989d6581b570c689e29e9f31e5fc85fa91dee1296d70b5f5c3b4aab527749850ea78bec3ef5947151b21598c3bb04e52f78b5e6db179e7fd922627862b5e SHA512 db7ea7c5f3489195a48216037b9371a50f1119ae7692d66f71b6711e5ccf78814670581bae015e408dee15c4bba921728309372c1cffc90113cdc092e8540821
DIST fltk-1.3.8-source.tar.gz 5335306 BLAKE2B 8c2d2fca4243c0e7c5a8aa46083940f99c8b3e7873d39d6e590a4b66587876393f209e5e7e5eaf4a4cc13f0f97cb03671d97129853b0146eeab409aaf687935e SHA512 5c1cbfc156c49888e25b90dcb9b1ab86a03447e08e00864c3c7ae8a0e32cfbd9154ee630054235c9edfd29fd1d0371ae77eff7b78094fb660dbbdec5cecfc8fb
-EBUILD fltk-1.3.5-r4.ebuild 4478 BLAKE2B 43565fa6ab5acda5ecab0357eb5e05228965ee833d29551ac5c6dc414dab699a15324c3d14d6243a9562bc099ca04afeaaa1cbdd66a1b507e61893847f72d9b8 SHA512 e220e505e8f599b64509eef79e0a8d0ecfc7c4a506de1a223716f91e431cc13d6de01f83a130fdb4931189fb3b796f0a4d1bac9e07bb0c9195b0a7ece6dc2059
-EBUILD fltk-1.3.8.ebuild 4338 BLAKE2B 768e8063ff86f03ab94b5c1fbf6ea036b136412eaa0e66ba94309575dfe0eabfbae12cd4103587c51de3009075a95672dd1332408f989d4a1ee7a5d24940fd7e SHA512 80431262d5faa59c6ef3f375d7d677520bc4a5dcb762b1f9c2dc8b1e759c72e5eb503d2203ebe365dad91d48e6d1a321c8533c736c8dd4de71b58a8a6458720d
-EBUILD fltk-1.3.9999.ebuild 4474 BLAKE2B b311a8912c78d2974bb00d15c3fab7afaf0053105589a1562446abdd50215ed6fb771348c7333839ad6fbb18fa98055aae3d9e4c47bea58c164009e7b2166eb2 SHA512 0f881ca9a0c6c4b9b4f7057d1f7620cdf3df3d223a551166e3399768667712eac1a383b5d7d15ae69ebad738f609b806752bbb6eb854039053233f45067b37c3
-EBUILD fltk-1.4.9999.ebuild 4507 BLAKE2B 19a036c9e428e024de516ba17370a393f0101b899920b864199ef690707fe11c1f125a59e6aa6d055fd2fc056e2077a1c622d1af1e8b93159ee129de825c8f25 SHA512 ad03a9e8cc6c255353eab74f6568276913fd5d464578c6cb1bcb99170e5b9f1330033421922f3f56f1e84595d79ce9a4b4434153995e6cf4635ea6ba32a90d74
-MISC metadata.xml 586 BLAKE2B 87739da01b6fd739e084e26e94df55789b6e7fcbf8999cc48b773514f126334a89db60fa605378210c627a02813e6b08a330ef1c027a27123c116e2a84d5eae8 SHA512 8e4cfdfc9e47dd129d81e0ab178da7fa36d20fd615d1b54e9613d9115ee35d21cdaf35c60649a243203f5c1c4dd3111d9edce023f8a7cf006ed11380ae818a27
+EBUILD fltk-1.3.5-r4.ebuild 4579 BLAKE2B 1cd4f02ec46c6db49631a587fa39fa476f83f9ee713c7860247ba4f47d2afd494dc5cc0f5f8559b26e38e079ea99dcf37d75ab5f78f3c31b07fc6e0721de9213 SHA512 92070d9869bb07a3c86d8e3d66a3f2974b42858c9f64d93a0074d9069d49fb213fbd036b814ec0bf76ac9ff88fbb61883919bc1902a2a72eb649d5c8d54112bb
+EBUILD fltk-1.3.8.ebuild 4439 BLAKE2B 5e03a3b9f0d7dff3863716ae5c995ece2d0bc46067e5bd8fd39c79615dbe62bd1b96a0f43e4c4b4ecfba9078a4d0cfac8828726dbe9b1606d3f7d35f4ff078e4 SHA512 554d622c327c24fe59bbfdebbace3161485d07eef55a88ad3c868c2ef9781075517d1105fd967be5b06818978895a0804b7d310773bf7a6851721cafe2b217ab
+EBUILD fltk-1.3.9999.ebuild 4575 BLAKE2B 925ddd0a48d88ab18c48373372c4636b477e462116254d3de69bb855f2d35fcc04f89303ea0370ee324233ea59c135e91249477fa5b71b8c8cbc0a3cebc0b2ef SHA512 7eebba378da3d889cf820531f3aef42b8755ce4274dc16f891d42939dea656d18f57972ebbaed78f630b8f10e62d25acc9ac2307e3b8fe22a4d701bf0040f78b
+EBUILD fltk-1.4.9999.ebuild 4375 BLAKE2B f72287f281ef2994be864b118d01de1fb15577a8ab8f002bfd178848eab2a463524499a37021441dc9354300313123ae94e73620b20ce190e7907b3b58ff3059 SHA512 bdfd6123d363bc3a2a7453a247325970f348eb2ae2a043394880381aa5b26b904cd29bcd3cc501e9754a5a6904a3f1c534b83475d73a0548666a835517a2cc24
+MISC metadata.xml 657 BLAKE2B 3b8149138859276ea23b72969afbcae32725a2a2cb541b802cc37caa0621b8161cc3ba6f944ceddea5c5ae547b2a57ca344f4558648452e23f62182c65232140 SHA512 764bd4333938568be347da22d16ec023e86d5b0ae78754db195fade0d34830933ca4a768e538a29a29c9c7a765cd1828d6d76a4f021e2aa8dbbc56d21f883777
diff --git a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch b/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch
new file mode 100644
index 000000000000..3f576d501ece
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch
@@ -0,0 +1,19 @@
+diff --git a/configure.ac b/configure.ac
+index 6b64110b0..1330d3f27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1878,10 +1878,13 @@ dnl Set empty BINARY_DIR variable for fltk-config.in (CMake compatibility)
+ BINARY_DIR=
+ AC_SUBST([BINARY_DIR])
+
++INCLUDE_DIRS="${includedir}"
++AC_SUBST(INCLUDE_DIRS)
++
+ dnl Write all of the files...
+ AC_CONFIG_HEADERS([config.h:configh.in])
+ AC_CONFIG_HEADERS([FL/fl_config.h:fl_config.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.4.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch
new file mode 100644
index 000000000000..47db8d03c8d2
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index 2d99808d9..283f825dd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -103,9 +103,6 @@ makeinclude: configure configh.in makeinclude.in
+ touch config.h
+ chmod +x fltk-config
+
+-configure: configure.ac
+- autoconf
+-
+ portable-dist:
+ epm -v -s fltk.xpm fltk
+
+diff --git a/documentation/Makefile b/documentation/Makefile
+index 0b176246b..882fbf8a4 100644
+--- a/documentation/Makefile
++++ b/documentation/Makefile
+@@ -91,12 +91,6 @@ install: $(MANPAGES)
+ $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
+ fi
+ echo "Installing man pages in $(DESTDIR)$(mandir) ..."
+- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-options.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
+@@ -105,10 +99,6 @@ install: $(MANPAGES)
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
+
+ install-linux install-osx:
+- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
+- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+ -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
+ $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
+ $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
diff --git a/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch b/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch
new file mode 100644
index 000000000000..e49aa7408cca
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index c02de0972..2d99808d9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,8 +16,7 @@
+
+ include makeinclude
+
+-DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) $(FLUIDDIR) fltk-options test \
+- documentation
++DIRS = $(IMAGEDIRS) $(LIBDECORDIR) src $(CAIRODIR) fltk-options
+
+ all: makeinclude fltk-config
+ for dir in $(DIRS); do\
diff --git a/x11-libs/fltk/files/fltk-1.4.9999-optim.patch b/x11-libs/fltk/files/fltk-1.4.9999-optim.patch
new file mode 100644
index 000000000000..a1e18bbb74b2
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.4.9999-optim.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 1330d3f27..c76dba26f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1552,7 +1552,7 @@ AS_IF([test -n "$GCC"], [
+ AS_IF([test "x$with_optim" != x], [
+ OPTIM="$with_optim $OPTIM"
+ ], [
+- OPTIM="-Os $OPTIM"
++ OPTIM="$OPTIM"
+ ])
+ ])
+
diff --git a/x11-libs/fltk/fltk-1.3.5-r4.ebuild b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
index e21dcd6f8914..ad957e104713 100644
--- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild
+++ b/x11-libs/fltk/fltk-1.3.5-r4.ebuild
@@ -93,6 +93,11 @@ src_prepare() {
}
multilib_src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/881107
+ # Seems to be fixed in git (1.4.9999)
+ filter-lto
+
unset FLTK_LIBDIRS
local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
diff --git a/x11-libs/fltk/fltk-1.3.8.ebuild b/x11-libs/fltk/fltk-1.3.8.ebuild
index b287bf5fb251..710e3997f2a9 100644
--- a/x11-libs/fltk/fltk-1.3.8.ebuild
+++ b/x11-libs/fltk/fltk-1.3.8.ebuild
@@ -98,6 +98,11 @@ src_prepare() {
}
multilib_src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/881107
+ # Seems to be fixed in git (1.4.9999)
+ filter-lto
+
unset FLTK_LIBDIRS
local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
index ddbc8c24006c..8362de128971 100644
--- a/x11-libs/fltk/fltk-1.3.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -99,6 +99,11 @@ src_prepare() {
}
multilib_src_configure() {
+ # -Werror=odr
+ # https://bugs.gentoo.org/881107
+ # Seems to be fixed in git (1.4.9999)
+ filter-lto
+
local FLTK_INCDIR=${EPREFIX}/usr/include/fltk
local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR}
diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild
index 3504795dbf4a..74b44b10b0b6 100644
--- a/x11-libs/fltk/fltk-1.4.9999.ebuild
+++ b/x11-libs/fltk/fltk-1.4.9999.ebuild
@@ -46,15 +46,12 @@ DOCS=(
CHANGES_1.1.txt
CHANGES_1.3.txt
CREDITS.txt
- README.Android.md
README.CMake.txt
README.Cairo.txt
README.IDE.txt
- README.Pico.txt
README.Unix.txt
README.Windows.txt
README.abi-version.txt
- README.bundled-libs.txt
README.macOS.md
README.md
README.txt
@@ -66,10 +63,10 @@ FLTK_GAMES="
"
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
+ "${FILESDIR}"/${PN}-1.4.9999-makefile-dirs.patch
+ "${FILESDIR}"/${PN}-1.4.9999-conf-tests.patch
+ "${FILESDIR}"/${PN}-1.4.9999-cmake.patch
+ "${FILESDIR}"/${PN}-1.4.9999-optim.patch
)
pkg_setup() {
@@ -95,9 +92,6 @@ src_prepare() {
-e "/SILENT:/d" \
makeinclude.in || die
- # also in Makefile:config.guess config.sub:
- cp misc/config.{guess,sub} . || die
-
eautoconf
multilib_copy_sources
}
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
index c232dc3b2e1f..cc385decf7fd 100644
--- a/x11-libs/fltk/metadata.xml
+++ b/x11-libs/fltk/metadata.xml
@@ -9,6 +9,9 @@
GLUT emulation. FLTK also includes a UI builder called FLUID that
can be used to create applications.
</longdescription>
+<upstream>
+ <remote-id type="github">fltk/fltk</remote-id>
+</upstream>
<use>
<flag name="games">Builds and installs some extra games</flag>
</use>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 01:48:10 +0000