diff options
Diffstat (limited to 'x11-libs')
101 files changed, 470 insertions, 1077 deletions
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest index 3864bc146832..db1f593a38b8 100644 --- a/x11-libs/fltk/Manifest +++ b/x11-libs/fltk/Manifest @@ -1,2 +1,2 @@ -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 +DIST fltk-1.4.1-source.tar.bz2 8456879 BLAKE2B 0301cfa7f47cde892b390ccabc1724d055cee2544cec6afe60cb1d62fed644d0100865e1889b70c06b8c4169a1af4285500a746e4c82ecb4908567c5887fc084 SHA512 90b223f66e3a8eb23225a259cddfeb90f1f8744ff6a366f274923c1c34d251e028835755d1738efb53398ac7e45e362a71542978faef04fc3d84a87f7b722037 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 deleted file mode 100644 index ca7607afa4fc..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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.5-AR.patch b/x11-libs/fltk/files/fltk-1.3.5-AR.patch deleted file mode 100644 index 34dbc8769f09..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.5-AR.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -430,7 +430,7 @@ AC_PATH_PROG(DOXYDOC,doxygen) - - dnl How do we make libraries? - AC_PROG_RANLIB --AC_PATH_TOOL(AR, ar) -+AC_CHECK_TOOL(AR, ar) - - if test "x$AR" = "x:"; then - AC_MSG_ERROR([Configure could not find the library archiver, aborting.]) diff --git a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch b/x11-libs/fltk/files/fltk-1.3.5-cmake.patch deleted file mode 100644 index 1eac250248d2..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.5-cmake.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 deleted file mode 100644 index 4d1512d749dd..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.5-optim.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/files/fltk-1.3.9999-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch deleted file mode 100644 index 994df56ad361..000000000000 --- a/x11-libs/fltk/files/fltk-1.3.9999-conf-tests.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -100,9 +103,6 @@ - touch config.h - chmod +x fltk-config - --configure: configure.ac -- autoconf -- - config.guess config.sub: - -automake --add-missing 2> /dev/null - if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi ---- a/documentation/Makefile -+++ b/documentation/Makefile -@@ -84,11 +84,6 @@ - $(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_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 -@@ -96,10 +91,6 @@ - $(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 -@@ -108,17 +99,11 @@ - - uninstall: - $(RMDIR) $(DESTDIR)$(docdir) -- $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fluid.1 -- $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT) - $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1 -- $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT) - $(RM) $(DESTDIR)$(mandir)/man3/fltk.3 - - uninstall-linux uninstall-osx: -- $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT) -- $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT) -- $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT) - $(RM) $(DESTDIR)$(mandir)/man6/blocks.6 - $(RM) $(DESTDIR)$(mandir)/man6/checkers.6 - $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6 diff --git a/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch b/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch new file mode 100644 index 000000000000..ee933b46b4df --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.4.1-fltk-config.patch @@ -0,0 +1,25 @@ +The "CFLAGS" variable here concatenates user's CFLAGS (unwanted in +fltk-config's @CFLAGS@) and FLTK_CFLAGS a bit below (wanted). + +So prevent addition of CMAKE_C_FLAGS_* and keep the rest. + +CXXFLAGS not touched given it does set(CXXFLAGS "${CFLAGS}"). + +Also drop @LDFLAGS@ as a precaution, it's not currently set by cmake +but it's likely an oversight. @LARGEFILE@ (currently still in .in) and +such are only used by autoconf (cmake appends into @CFLAGS@). +--- a/CMake/variables.cmake ++++ b/CMake/variables.cmake +@@ -139,6 +139 @@ +-string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_UPPER) +-if(${BUILD_UPPER}) +- set(CFLAGS "${CMAKE_C_FLAGS_${BUILD_UPPER}} ${CFLAGS}") +-endif(${BUILD_UPPER}) +- +-set(CFLAGS "${FLTK_OPTION_OPTIM} ${CMAKE_C_FLAGS} ${CFLAGS}") ++set(CFLAGS "${FLTK_OPTION_OPTIM} ${CFLAGS}") +--- a/fltk-config.in ++++ b/fltk-config.in +@@ -38 +38 @@ +-LDFLAGS="@LDFLAGS@" ++LDFLAGS="" diff --git a/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch b/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch new file mode 100644 index 000000000000..7243efa21fcd --- /dev/null +++ b/x11-libs/fltk/files/fltk-1.4.1-tests-odr.patch @@ -0,0 +1,9 @@ +We only use the unittests-shared example and this unused one has ODR +violations. Skip building it for now rather than filter-lto w/ tests +to avoid triggering -Werror=odr -flto CI (ideally would want to only +build unittests and not have to worry about build time + quirks of +all examples). +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -100 +99,0 @@ +-fl_create_example(coordinates coordinates.cxx fltk::fltk) diff --git a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch b/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch deleted file mode 100644 index 3f576d501ece..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-cmake.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 deleted file mode 100644 index 47db8d03c8d2..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-conf-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 deleted file mode 100644 index e49aa7408cca..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-makefile-dirs.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index a1e18bbb74b2..000000000000 --- a/x11-libs/fltk/files/fltk-1.4.9999-optim.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 69b47fc0d881..000000000000 --- a/x11-libs/fltk/fltk-1.3.5-r4.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic xdg-utils multilib-minimal - -DESCRIPTION="C++ user interface toolkit for X and OpenGL" -HOMEPAGE="https://www.fltk.org/" -SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz" - -SLOT="1" -LICENSE="FLTK LGPL-2" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" - -RDEPEND=" - >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - 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}] - ) - xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-text/doxygen ) -" -DOCS=( - ANNOUNCEMENT - CHANGES - CHANGES_1.0 - CHANGES_1.1 - CREDITS - README - README.abi-version.txt - README.Cairo.txt - README.CMake.txt - README.MSWindows.txt - README.OSX.txt - README.Unix.txt -) -FLTK_GAMES=" - blocks - checkers - sudoku -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-share.patch - "${FILESDIR}"/${PN}-1.3.3-fltk-config.patch - "${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 - "${FILESDIR}"/${PN}-1.3.5-AR.patch -) - -src_prepare() { - default - - rm -rf zlib jpeg png || die - - sed -i \ - -e 's:@HLINKS@::g' FL/Makefile.in || die - # docs in proper docdir - sed -i \ - -e "/^docdir/s:fltk:${PF}/html:" \ - -e "/SILENT:/d" \ - makeinclude.in || die - - # also in Makefile:config.guess config.sub: - cp misc/config.{guess,sub} . || die - - cp fluid/{,x-}fluid.desktop || die - - eaclocal - eautoconf - multilib_copy_sources -} - -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 - local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk - FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR} - - multilib_is_native_abi && use prefix && - append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" - - econf \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable opengl gl) \ - $(use_enable threads) \ - $(use_enable xft) \ - $(use_enable xinerama) \ - --disable-localjpeg \ - --disable-localpng \ - --disable-localzlib \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-largefile \ - --enable-shared \ - --enable-xcursor \ - --enable-xdbe \ - --enable-xfixes \ - --includedir=${FLTK_INCDIR} \ - --libdir=${FLTK_LIBDIR} \ - DSOFLAGS="${LDFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -multilib_src_compile() { - # Prevent reconfigure on non-native ABIs. - touch -r makeinclude config.{guess,sub} || die - - default - - if multilib_is_native_abi; then - emake -C fluid - use doc && emake -C documentation html - use games && emake -C test ${FLTK_GAMES} - fi -} - -multilib_src_test() { - emake -C fluid - emake -C test -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - emake -C fluid DESTDIR="${D}" install-linux install - - use doc && \ - emake -C documentation DESTDIR="${D}" install - - use games && \ - emake -C test DESTDIR="${D}" install-linux - fi -} - -multilib_src_install_all() { - for app in fluid $(usex games "${FLTK_GAMES}" ''); do - dosym \ - ../icons/hicolor/32x32/apps/${app}.png \ - /usr/share/pixmaps/${app}.png - done - - if use examples; then - docinto examples - dodoc -r test/*.{h,cxx,fl} test/demo.menu - fi - - insinto /usr/share/cmake/Modules - doins CMake/FLTK*.cmake - - echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die - echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die - doenvd 99fltk - - # FIXME: This is bad, but building only shared libraries is hardly supported - # FIXME: The executables in test/ are linking statically against libfltk - if ! use static-libs; then - rm "${ED}"/usr/lib*/fltk/*.a || die - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-libs/fltk/fltk-1.3.8.ebuild b/x11-libs/fltk/fltk-1.3.8.ebuild index af7fb86ee352..d9363b758188 100644 --- a/x11-libs/fltk/fltk-1.3.8.ebuild +++ b/x11-libs/fltk/fltk-1.3.8.ebuild @@ -9,8 +9,8 @@ DESCRIPTION="C++ user interface toolkit for X and OpenGL" HOMEPAGE="https://www.fltk.org/" SRC_URI="https://www.fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz" -SLOT="1" LICENSE="FLTK LGPL-2" +SLOT="1" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild deleted file mode 100644 index 8362de128971..000000000000 --- a/x11-libs/fltk/fltk-1.3.9999.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal - -DESCRIPTION="C++ user interface toolkit for X and OpenGL" -HOMEPAGE="https://www.fltk.org/" -EGIT_REPO_URI="https://github.com/fltk/fltk" -EGIT_OVERRIDE_BRANCH_FLTK_FLTK="branch-1.3" - -SLOT="1" -LICENSE="FLTK LGPL-2" -KEYWORDS="" -IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" - -RDEPEND=" - >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - 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}] - ) - xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-text/doxygen ) -" -DOCS=( - ANNOUNCEMENT - CHANGES - CHANGES_1.0 - CHANGES_1.1 - CREDITS - README - README.abi-version.txt - README.Cairo.txt - README.CMake.txt - README.MSWindows.txt - README.OSX.txt - README.Unix.txt -) -FLTK_GAMES=" - blocks - checkers - sudoku -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-share.patch - "${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() { - unset FLTK_LIBDIRS -} - -src_prepare() { - default - - rm -rf zlib jpeg png || die - - sed -i \ - -e 's:@HLINKS@::g' FL/Makefile.in || die - sed -i \ - -e '/x-fluid/d' fluid/Makefile || die - sed -i \ - -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \ - -e '/^LDFLAGS=/d' \ - "${S}/fltk-config.in" || die - # docs in proper docdir - sed -i \ - -e "/^docdir/s:fltk:${PF}/html:" \ - -e "/SILENT:/d" \ - makeinclude.in || die - - # also in Makefile:config.guess config.sub: - cp misc/config.{guess,sub} . || die - - eautoconf - multilib_copy_sources -} - -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} - - multilib_is_native_abi && use prefix && - append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" - - econf \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable opengl gl) \ - $(use_enable threads) \ - $(use_enable xft) \ - $(use_enable xinerama) \ - --disable-localjpeg \ - --disable-localpng \ - --disable-localzlib \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-largefile \ - --enable-shared \ - --enable-xcursor \ - --enable-xdbe \ - --enable-xfixes \ - --includedir=${FLTK_INCDIR} \ - --libdir=${FLTK_LIBDIR} \ - DSOFLAGS="${LDFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -multilib_src_compile() { - # Prevent reconfigure on non-native ABIs. - touch -r makeinclude config.{guess,sub} || die - - default - - if multilib_is_native_abi; then - emake -C fluid - use doc && emake -C documentation html - use games && emake -C test ${FLTK_GAMES} - fi -} - -multilib_src_test() { - emake -C fluid - emake -C test -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - emake -C fluid \ - DESTDIR="${D}" install-linux install - - use doc && - emake -C documentation \ - DESTDIR="${D}" install - - use games && - emake -C test \ - DESTDIR="${D}" install-linux - fi -} - -multilib_src_install_all() { - for app in fluid $(usex games "${FLTK_GAMES}" ''); do - dosym \ - ../icons/hicolor/32x32/apps/${app}.png \ - /usr/share/pixmaps/${app}.png - done - - if use examples; then - docinto examples - dodoc -r test/*.{h,cxx,fl} test/demo.menu - fi - - insinto /usr/share/cmake/Modules - doins CMake/FLTK*.cmake - - echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die - echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die - doenvd 99fltk - - # FIXME: This is bad, but building only shared libraries is hardly supported - # FIXME: The executables in test/ are linking statically against libfltk - if ! use static-libs; then - rm "${ED}"/usr/lib*/fltk/*.a || die - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-libs/fltk/fltk-1.4.1.ebuild b/x11-libs/fltk/fltk-1.4.1.ebuild new file mode 100644 index 000000000000..c783579112e2 --- /dev/null +++ b/x11-libs/fltk/fltk-1.4.1.ebuild @@ -0,0 +1,113 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake edo xdg + +DESCRIPTION="Fast Light GUI Toolkit" +HOMEPAGE="https://www.fltk.org/" +SRC_URI="https://github.com/fltk/fltk/releases/download/release-${PV}/${P}-source.tar.bz2" + +LICENSE="FLTK LGPL-2 MIT ZLIB" +SLOT="1/$(ver_cut 1-2)" # README.abi-version.txt +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="+X +cairo doc examples opengl static-libs test wayland" +REQUIRED_USE=" + || ( X wayland ) + wayland? ( cairo ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-libs/libjpeg-turbo:= + media-libs/libpng:= + sys-libs/zlib:= + X? ( + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXinerama + !cairo? ( + media-libs/fontconfig + x11-libs/libXft + x11-libs/libXrender + ) + ) + cairo? ( + dev-libs/glib:2 + x11-libs/cairo + x11-libs/pango[X?] + ) + opengl? ( + media-libs/glu + media-libs/libglvnd[X] + ) + wayland? ( + dev-libs/wayland + gui-libs/libdecor + sys-apps/dbus + x11-libs/libxkbcommon + ) +" +DEPEND=" + ${RDEPEND} + X? ( x11-base/xorg-proto ) + wayland? ( dev-libs/wayland-protocols ) +" +BDEPEND=" + doc? ( app-text/doxygen ) + wayland? ( dev-util/wayland-scanner ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.1-fltk-config.patch + "${FILESDIR}"/${PN}-1.4.1-tests-odr.patch +) + +src_prepare() { + cmake_src_prepare + + # fluid can optionally use html docs at runtime, adjust path + sed -i "s|\${FLTK_DOCDIR}/fltk|&-${PVR}/html|" CMake/export.cmake || die +} + +src_configure() { + local mycmakeargs=( + -DFLTK_BACKEND_WAYLAND=$(usex wayland) + -DFLTK_BACKEND_X11=$(usex X) + -DFLTK_BUILD_FLUID=yes + -DFLTK_BUILD_FLUID_DOCS=no + -DFLTK_BUILD_GL=$(usex opengl) + -DFLTK_BUILD_HTML_DOCS=$(usex doc) + -DFLTK_BUILD_PDF_DOCS=no + -DFLTK_BUILD_SHARED_LIBS=yes + -DFLTK_BUILD_TEST=$(usex test) + -DFLTK_GRAPHICS_CAIRO=$(usex cairo) + -DFLTK_OPTION_STD=yes # will be removed & forced ON in fltk-1.5 + ) + + cmake_src_configure +} + +src_compile() { + cmake_src_compile all $(usev doc docs) +} + +src_test() { + # same that upstream's CI does except with the shared version + edo "${BUILD_DIR}"/bin/test/unittests-shared --core +} + +src_install() { + local DOCS=( + ANNOUNCEMENT CHANGES* CREDITS.txt README* + $(usev examples) + # simpler than using -DFLTK_INSTALL_HTML_DOCS for the location + $(usev doc "${BUILD_DIR}"/documentation/html) + ) + cmake_src_install + + # currently no option to disable building static libs + use static-libs || rm -- "${ED}"/usr/$(get_libdir)/*.a || die +} diff --git a/x11-libs/fltk/fltk-1.4.9999.ebuild b/x11-libs/fltk/fltk-1.4.9999.ebuild deleted file mode 100644 index 74b44b10b0b6..000000000000 --- a/x11-libs/fltk/fltk-1.4.9999.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic git-r3 xdg-utils multilib-minimal - -DESCRIPTION="C++ user interface toolkit for X and OpenGL" -HOMEPAGE="https://www.fltk.org/" -EGIT_REPO_URI="https://github.com/fltk/fltk" - -SLOT="1" -LICENSE="FLTK LGPL-2" -KEYWORDS="" -IUSE="cairo debug doc examples games +opengl static-libs +threads +xft +xinerama" - -RDEPEND=" - >=media-libs/libpng-1.2:0=[${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - x11-libs/libICE[${MULTILIB_USEDEP}] - x11-libs/libSM[${MULTILIB_USEDEP}] - x11-libs/libXcursor[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - 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}] - ) - xft? ( x11-libs/libXft[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-text/doxygen ) -" -DOCS=( - ANNOUNCEMENT - CHANGES.txt - CHANGES_1.0.txt - CHANGES_1.1.txt - CHANGES_1.3.txt - CREDITS.txt - README.CMake.txt - README.Cairo.txt - README.IDE.txt - README.Unix.txt - README.Windows.txt - README.abi-version.txt - README.macOS.md - README.md - README.txt -) -FLTK_GAMES=" - blocks - checkers - sudoku -" -PATCHES=( - "${FILESDIR}"/${PN}-1.3.0-share.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() { - unset FLTK_LIBDIRS -} - -src_prepare() { - default - - rm -rf zlib jpeg png || die - - sed -i \ - -e 's:@HLINKS@::g' FL/Makefile.in || die - sed -i \ - -e '/x-fluid/d' fluid/Makefile || die - sed -i \ - -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \ - -e '/^LDFLAGS=/d' \ - "${S}/fltk-config.in" || die - # docs in proper docdir - sed -i \ - -e "/^docdir/s:fltk:${PF}/html:" \ - -e "/SILENT:/d" \ - makeinclude.in || die - - eautoconf - multilib_copy_sources -} - -multilib_src_configure() { - local FLTK_INCDIR=${EPREFIX}/usr/include/fltk - local FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk - FLTK_LIBDIRS+=${FLTK_LIBDIRS+:}${FLTK_LIBDIR} - - multilib_is_native_abi && use prefix && - append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}" - - econf \ - $(use_enable cairo) \ - $(use_enable debug) \ - $(use_enable opengl gl) \ - $(use_enable threads) \ - $(use_enable xft) \ - $(use_enable xinerama) \ - --disable-localjpeg \ - --disable-localpng \ - --disable-localzlib \ - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ - --enable-largefile \ - --enable-shared \ - --enable-xcursor \ - --enable-xdbe \ - --enable-xfixes \ - --includedir=${FLTK_INCDIR} \ - --libdir=${FLTK_LIBDIR} \ - DSOFLAGS="${LDFLAGS}" \ - LDFLAGS="${LDFLAGS}" -} - -multilib_src_compile() { - # Prevent reconfigure on non-native ABIs. - touch -r makeinclude config.{guess,sub} || die - - default - - if multilib_is_native_abi; then - emake -C fluid - use doc && emake -C documentation html - use games && emake -C test ${FLTK_GAMES} - fi -} - -multilib_src_test() { - emake -C fluid - emake -C test -} - -multilib_src_install() { - default - - if multilib_is_native_abi; then - emake -C fluid \ - DESTDIR="${D}" install-linux install - - use doc && - emake -C documentation \ - DESTDIR="${D}" install - - use games && - emake -C test \ - DESTDIR="${D}" install-linux - fi -} - -multilib_src_install_all() { - for app in fluid $(usex games "${FLTK_GAMES}" ''); do - dosym \ - ../icons/hicolor/32x32/apps/${app}.png \ - /usr/share/pixmaps/${app}.png - done - - if use examples; then - docinto examples - dodoc -r test/*.{h,cxx,fl} test/demo.menu - fi - - insinto /usr/share/cmake/Modules - doins CMake/FLTK*.cmake - - echo "LDPATH=${FLTK_LIBDIRS}" > 99fltk || die - echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk || die - doenvd 99fltk - - # FIXME: This is bad, but building only shared libraries is hardly supported - # FIXME: The executables in test/ are linking statically against libfltk - if ! use static-libs; then - rm "${ED}"/usr/lib*/fltk/*.a || die - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml index cc385decf7fd..9c84f80f4c14 100644 --- a/x11-libs/fltk/metadata.xml +++ b/x11-libs/fltk/metadata.xml @@ -1,18 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> -<longdescription> - The Fast Light ToolKit is a cross-platform C++ user interface - toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI - functionality and supports 3D graphics via OpenGL and its built-in - 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> + <maintainer type="person"> + <email>ionen@gentoo.org</email> + <name>Ionen Wolkens</name> + </maintainer> + <longdescription> + The Fast Light ToolKit is a cross-platform C++ user interface + toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides + GUI functionality and supports 3D graphics via OpenGL and its + built-in 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> </pkgmetadata> diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild index f94ce12c9ffb..d4e259dd0d30 100644 --- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild +++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.12.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf" LICENSE="LGPL-2.1+" SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" IUSE="gtk-doc +introspection gif jpeg test tiff" RESTRICT="!test? ( test )" diff --git a/x11-libs/gtk+/gtk+-3.24.42-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.42-r1.ebuild index 49fb87f1c4d1..5d6ab8391f5b 100644 --- a/x11-libs/gtk+/gtk+-3.24.42-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.24.42-r1.ebuild @@ -18,7 +18,7 @@ REQUIRED_USE=" " RESTRICT="!test? ( test )" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" COMMON_DEPEND=" >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}] diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild index c105cd7c3479..fda38717ebd8 100644 --- a/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild +++ b/x11-libs/gtkglext/gtkglext-1.2.0-r6.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.bz2" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" RDEPEND=" >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild index c01a9ffd40f6..b92bfa7d0cb3 100644 --- a/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild +++ b/x11-libs/gtksourceview/gtksourceview-3.24.11-r2.ebuild @@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView" LICENSE="GPL-2+ LGPL-2.1+" SLOT="3.0/3" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="glade +introspection +vala" REQUIRED_USE="vala? ( introspection )" diff --git a/x11-libs/libFS/libFS-1.0.10.ebuild b/x11-libs/libFS/libFS-1.0.10.ebuild index 6ca8db0f866c..1a29d1db1572 100644 --- a/x11-libs/libFS/libFS-1.0.10.ebuild +++ b/x11-libs/libFS/libFS-1.0.10.ebuild @@ -3,7 +3,6 @@ EAPI=8 -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org FS library" diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest index 9d07fe65f5d1..5ff71f7f2761 100644 --- a/x11-libs/libICE/Manifest +++ b/x11-libs/libICE/Manifest @@ -1 +1,2 @@ DIST libICE-1.1.1.tar.xz 335960 BLAKE2B 2849418aa0a66a9137481194bb91208fae4a1eb9a4f9f509b52da7668b8281b6c36f4ba4bdc686eb008a2561b89801fb9270b22887b7c5044e6c14a1ae94dfae SHA512 2f7833a25f31cc743ca95cb88f9a8403b50e19ffb5bf43bfef87ba405857d359789daaa9ec2391351237d958f16d35dbf082adb76d301e46d3a54162a6b452d3 +DIST libICE-1.1.2.tar.xz 342900 BLAKE2B 8dbfb61382009397260415a68a74dd27e277815b22000a617fc688cf12257293de8e29a69df91e88dcae93e14f193bf653ed8dee747b4c2bf5493a509ed9b937 SHA512 340f51ffa1f14ed442ab8bcea92dd63df147c48242e232e818cafe02f43de7ab6e99c5430b9cb8d0dc661295239d2b3f6bdb6a092ce51a98afa06235257e9b1f diff --git a/x11-libs/libICE/libICE-1.1.1-r1.ebuild b/x11-libs/libICE/libICE-1.1.1-r1.ebuild index 4d9a9525de59..0ad7ffc51e51 100644 --- a/x11-libs/libICE/libICE-1.1.1-r1.ebuild +++ b/x11-libs/libICE/libICE-1.1.1-r1.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Inter-Client Exchange library" diff --git a/x11-libs/libICE/libICE-1.1.2.ebuild b/x11-libs/libICE/libICE-1.1.2.ebuild new file mode 100644 index 000000000000..785a1fb65354 --- /dev/null +++ b/x11-libs/libICE/libICE-1.1.2.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +inherit xorg-3 + +DESCRIPTION="X.Org Inter-Client Exchange library" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + elibc_glibc? ( + || ( >=sys-libs/glibc-2.36 dev-libs/libbsd[${MULTILIB_USEDEP}] ) + ) +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/xtrans +" + +XORG_CONFIGURE_OPTIONS=( + --enable-ipv6 + --disable-docs + --disable-specs + --without-fop +) diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest index 96c5aa3da26b..d116a8f34d90 100644 --- a/x11-libs/libSM/Manifest +++ b/x11-libs/libSM/Manifest @@ -1 +1,2 @@ DIST libSM-1.2.4.tar.xz 306944 BLAKE2B c1944cd8e25389cffc18e9f6e46e3543381a2d74036cff2c24f063c1defca001c94055ef278dc468123b1f60f145df5daf34bcec39875ad918b664a3c279777a SHA512 7f1d41b7b6c5dd456c49ccad7740c3ba9791a2793fa50fd94814a4164ce2e20c4a0a0ad42a87708e494ed5c23f611be6d3ccd9ef1e9add6d46ac545e2b0f6f86 +DIST libSM-1.2.5.tar.xz 312708 BLAKE2B 9babbc5409037d1292c85c0b23ff21975f614e9cfe53c6878761e67489815862a98ef84a2249161279fd5d7af7ff886cfbafb63b82832ee142e513e3d359e6cd SHA512 f2e58503a7cd144a610621104b4727878dd5ba0cdf8220e72f27a3474c9b49c01dc514c60cbdfb35a9318f307b27a601580725cef0f6b5091d4c4ea57cef8c91 diff --git a/x11-libs/libSM/libSM-1.2.4.ebuild b/x11-libs/libSM/libSM-1.2.4.ebuild index dd82f54b1b0d..ee83ca5eaaca 100644 --- a/x11-libs/libSM/libSM-1.2.4.ebuild +++ b/x11-libs/libSM/libSM-1.2.4.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Session Management library" diff --git a/x11-libs/libSM/libSM-1.2.5.ebuild b/x11-libs/libSM/libSM-1.2.5.ebuild new file mode 100644 index 000000000000..10ddac0c4b4d --- /dev/null +++ b/x11-libs/libSM/libSM-1.2.5.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +inherit xorg-3 + +DESCRIPTION="X.Org Session Management library" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="+uuid" + +RDEPEND=" + >=x11-libs/libICE-1.1.0[${MULTILIB_USEDEP}] + uuid? ( + elibc_Darwin? ( sys-libs/native-uuid ) + !elibc_SunOS? ( !elibc_Darwin? ( + >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] + ) ) + )" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/xtrans" + +src_configure() { + local withuuid=$(use_with uuid libuuid) + + # do not use uuid even if available in libc (like on FreeBSD) + use uuid || export ac_cv_func_uuid_create=no + + if use uuid ; then + case ${CHOST} in + *-solaris*|*-darwin*) + if [[ ! -d ${EROOT}/usr/include/uuid ]] && + [[ -d ${ROOT}/usr/include/uuid ]] + then + # Solaris and Darwin have uuid provided by the host + # system. Since util-linux's version is based on this + # version, and on Darwin actually breaks host headers when + # installed, we can "pretend" for libSM we have libuuid + # installed, while in fact we don't + withuuid="--without-libuuid" + export HAVE_LIBUUID=yes + export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid" + # Darwin has uuid in libSystem + [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid" + fi + ;; + esac + fi + + local XORG_CONFIGURE_OPTIONS=( + --enable-ipv6 + $(use_enable doc docs) + $(use_with doc xmlto) + ${withuuid} + --without-fop + ) + xorg-3_src_configure +} diff --git a/x11-libs/libX11/libX11-1.8.10.ebuild b/x11-libs/libX11/libX11-1.8.10.ebuild index 0373870f143a..35d1e55b1484 100644 --- a/x11-libs/libX11/libX11-1.8.10.ebuild +++ b/x11-libs/libX11/libX11-1.8.10.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX=xz inherit toolchain-funcs xorg-3 # Note: please bump this with x11-misc/compose-tables diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.4.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.4.ebuild index 3cf0e080fd74..3555acf2db7f 100644 --- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.4.ebuild +++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.4.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org XScrnSaver library" diff --git a/x11-libs/libXau/Manifest b/x11-libs/libXau/Manifest index 564f4c325e6e..f1fc9d3f0e50 100644 --- a/x11-libs/libXau/Manifest +++ b/x11-libs/libXau/Manifest @@ -1 +1,2 @@ DIST libXau-1.0.11.tar.xz 274108 BLAKE2B ffd037d6a5bd8bbf10d15747469c5277b3061b87793d8acf095f60aa121bdc0831da9d3e6c369846fd40d2ba03ef209e1e8febff64736d4ececd135a8fabb0a3 SHA512 f56abba3bef3fdd4739dfa69367a4251b5fab7c89194c9aece9efa66b9ebbf0736690cc9bd654aab19d9db377e4b9a5268c9c020b3d293bb5351bff5fe75a4dd +DIST libXau-1.0.12.tar.xz 282624 BLAKE2B 739c1ed5cc86eaf6116bb324808e442ee485fb81bc882f873d924302494e93c3eae1a2ad3f92e115faf72e647578e7b9501c73ac18db1839edc2fb69a143a834 SHA512 4bbe8796f4a14340499d5f75046955905531ea2948944dfc3d6069f8b86c1710042bfc7918d459320557883e6631359d48e6173c69c62ff572314e864ff97c5e diff --git a/x11-libs/libXau/libXau-1.0.11.ebuild b/x11-libs/libXau/libXau-1.0.11.ebuild index a94314b41953..11a6e56cc865 100644 --- a/x11-libs/libXau/libXau-1.0.11.ebuild +++ b/x11-libs/libXau/libXau-1.0.11.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org X authorization library" diff --git a/x11-libs/libXau/libXau-1.0.12.ebuild b/x11-libs/libXau/libXau-1.0.12.ebuild new file mode 100644 index 000000000000..1c0a73d5c571 --- /dev/null +++ b/x11-libs/libXau/libXau-1.0.12.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +inherit xorg-3 + +DESCRIPTION="X.Org X authorization library" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +DEPEND="x11-base/xorg-proto" diff --git a/x11-libs/libXaw/libXaw-1.0.16.ebuild b/x11-libs/libXaw/libXaw-1.0.16.ebuild index f1c40496cc60..d001848471dc 100644 --- a/x11-libs/libXaw/libXaw-1.0.16.ebuild +++ b/x11-libs/libXaw/libXaw-1.0.16.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xaw library" diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild index da0cca16485e..9932d6b72513 100644 --- a/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild +++ b/x11-libs/libXaw3d/libXaw3d-1.6.6.ebuild @@ -3,7 +3,6 @@ EAPI=8 -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xaw3d library" diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild index 5c231caea0b9..b34a5ba843ee 100644 --- a/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild +++ b/x11-libs/libXcomposite/libXcomposite-0.4.6.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xcomposite library" diff --git a/x11-libs/libXcursor/libXcursor-1.2.2.ebuild b/x11-libs/libXcursor/libXcursor-1.2.2.ebuild index 3ceb100959a8..49637dfdb577 100644 --- a/x11-libs/libXcursor/libXcursor-1.2.2.ebuild +++ b/x11-libs/libXcursor/libXcursor-1.2.2.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX=xz inherit xorg-3 DESCRIPTION="X.Org Xcursor library" diff --git a/x11-libs/libXcursor/libXcursor-1.2.3.ebuild b/x11-libs/libXcursor/libXcursor-1.2.3.ebuild index dc173f8b0940..9ebebbe34d20 100644 --- a/x11-libs/libXcursor/libXcursor-1.2.3.ebuild +++ b/x11-libs/libXcursor/libXcursor-1.2.3.ebuild @@ -4,12 +4,11 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX=xz inherit xorg-3 DESCRIPTION="X.Org Xcursor library" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="doc" RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] diff --git a/x11-libs/libXdamage/libXdamage-1.1.6.ebuild b/x11-libs/libXdamage/libXdamage-1.1.6.ebuild index 110b792b955a..fddb9e43816e 100644 --- a/x11-libs/libXdamage/libXdamage-1.1.6.ebuild +++ b/x11-libs/libXdamage/libXdamage-1.1.6.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xdamage library" diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild index f5802b3c12a3..786cf8aab779 100644 --- a/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild +++ b/x11-libs/libXdmcp/libXdmcp-1.1.5.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org X Display Manager Control Protocol library" diff --git a/x11-libs/libXext/libXext-1.3.6.ebuild b/x11-libs/libXext/libXext-1.3.6.ebuild index b431446fa5de..fff77dff2c08 100644 --- a/x11-libs/libXext/libXext-1.3.6.ebuild +++ b/x11-libs/libXext/libXext-1.3.6.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xext library" diff --git a/x11-libs/libXfixes/libXfixes-6.0.1.ebuild b/x11-libs/libXfixes/libXfixes-6.0.1.ebuild index 9647cfdbb7fe..e51b34c52585 100644 --- a/x11-libs/libXfixes/libXfixes-6.0.1.ebuild +++ b/x11-libs/libXfixes/libXfixes-6.0.1.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xfixes library" diff --git a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild index 4536bd3795e8..77e6001c6477 100644 --- a/x11-libs/libXfont2/libXfont2-2.0.7.ebuild +++ b/x11-libs/libXfont2/libXfont2-2.0.7.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_PACKAGE_NAME=libxfont -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xfont library" diff --git a/x11-libs/libXft/libXft-2.3.8.ebuild b/x11-libs/libXft/libXft-2.3.8.ebuild index df64a7cbe0c2..a9c17be28d05 100644 --- a/x11-libs/libXft/libXft-2.3.8.ebuild +++ b/x11-libs/libXft/libXft-2.3.8.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xft library" diff --git a/x11-libs/libXi/libXi-1.8.2.ebuild b/x11-libs/libXi/libXi-1.8.2.ebuild index 81f9cd0e3ab1..416ba23c4b25 100644 --- a/x11-libs/libXi/libXi-1.8.2.ebuild +++ b/x11-libs/libXi/libXi-1.8.2.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xi library" diff --git a/x11-libs/libXinerama/libXinerama-1.1.5.ebuild b/x11-libs/libXinerama/libXinerama-1.1.5.ebuild index 05c2b8a684e6..b1e0d79bca7b 100644 --- a/x11-libs/libXinerama/libXinerama-1.1.5.ebuild +++ b/x11-libs/libXinerama/libXinerama-1.1.5.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xinerama library" diff --git a/x11-libs/libXmu/libXmu-1.2.1.ebuild b/x11-libs/libXmu/libXmu-1.2.1.ebuild index 3cfd0e943f2e..0813d6de07b7 100644 --- a/x11-libs/libXmu/libXmu-1.2.1.ebuild +++ b/x11-libs/libXmu/libXmu-1.2.1.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xmu library" diff --git a/x11-libs/libXpm/libXpm-3.5.17.ebuild b/x11-libs/libXpm/libXpm-3.5.17.ebuild index 4bd16ea24332..7b0458f4f477 100644 --- a/x11-libs/libXpm/libXpm-3.5.17.ebuild +++ b/x11-libs/libXpm/libXpm-3.5.17.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xpm library" diff --git a/x11-libs/libXpresent/libXpresent-1.0.1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.1.ebuild index 243ffe6e81ad..5280d59f2450 100644 --- a/x11-libs/libXpresent/libXpresent-1.0.1.ebuild +++ b/x11-libs/libXpresent/libXpresent-1.0.1.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X Present Extension C Library" diff --git a/x11-libs/libXrandr/libXrandr-1.5.4.ebuild b/x11-libs/libXrandr/libXrandr-1.5.4.ebuild index f1f2acf20443..552a5602d0d8 100644 --- a/x11-libs/libXrandr/libXrandr-1.5.4.ebuild +++ b/x11-libs/libXrandr/libXrandr-1.5.4.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xrandr library" diff --git a/x11-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest index 6d46a5d40c0a..e3c738138074 100644 --- a/x11-libs/libXrender/Manifest +++ b/x11-libs/libXrender/Manifest @@ -1 +1,2 @@ DIST libXrender-0.9.11.tar.xz 302900 BLAKE2B b603118a02bc0bd64a98ac9820e6fd46a0613441b630d10aa8955c3a5e364c283f3d7323f7cd64e6c3a4c599409ae9d7c847751edc3250946342008abb66a015 SHA512 2327cc1b530382d81df29b8d579f801f1f990202107cc84506986bcf5d15010d414e9418987b200e3f222d188afce46f0d7754febcdca62a5fc1e541b3bb82de +DIST libXrender-0.9.12.tar.xz 310432 BLAKE2B 703f32aabc074097796ecf97933fd9eb74aca4794496ae5d62fac3cef8646d41fffa8904ac3e76735473f918fa65e9c3da16e54ac512c45f2b00592e8e46dff1 SHA512 3d24a6877b500608e3e2a393532a99d4fd54fc343375d8fb51dfbb1b50cedf002c7722f771cf7776f93cb6e0421ca5966ce45435cb402d5f12a398f9ea743474 diff --git a/x11-libs/libXrender/libXrender-0.9.11.ebuild b/x11-libs/libXrender/libXrender-0.9.11.ebuild index 190787b37941..4e4fcbab1b40 100644 --- a/x11-libs/libXrender/libXrender-0.9.11.ebuild +++ b/x11-libs/libXrender/libXrender-0.9.11.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xrender library" diff --git a/x11-libs/libXrender/libXrender-0.9.12.ebuild b/x11-libs/libXrender/libXrender-0.9.12.ebuild new file mode 100644 index 000000000000..7b1f6b8804a9 --- /dev/null +++ b/x11-libs/libXrender/libXrender-0.9.12.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +inherit xorg-3 + +DESCRIPTION="X.Org Xrender library" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXres/libXres-1.2.2.ebuild b/x11-libs/libXres/libXres-1.2.2.ebuild index 48850b6a5e90..d2d17ee2abb7 100644 --- a/x11-libs/libXres/libXres-1.2.2.ebuild +++ b/x11-libs/libXres/libXres-1.2.2.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_DOC=doc -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org XRes library" diff --git a/x11-libs/libXt/libXt-1.3.0.ebuild b/x11-libs/libXt/libXt-1.3.0.ebuild index 7ebd4111d8fc..2609b04707b4 100644 --- a/x11-libs/libXt/libXt-1.3.0.ebuild +++ b/x11-libs/libXt/libXt-1.3.0.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org X Toolkit Intrinsics library" diff --git a/x11-libs/libXt/libXt-1.3.1.ebuild b/x11-libs/libXt/libXt-1.3.1.ebuild index 5fd94a46924b..84310ee76088 100644 --- a/x11-libs/libXt/libXt-1.3.1.ebuild +++ b/x11-libs/libXt/libXt-1.3.1.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org X Toolkit Intrinsics library" diff --git a/x11-libs/libXtst/libXtst-1.2.5.ebuild b/x11-libs/libXtst/libXtst-1.2.5.ebuild index 427d79387a65..4332e9c52623 100644 --- a/x11-libs/libXtst/libXtst-1.2.5.ebuild +++ b/x11-libs/libXtst/libXtst-1.2.5.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library" diff --git a/x11-libs/libXv/Manifest b/x11-libs/libXv/Manifest index 972bbbc76147..85a27731ec38 100644 --- a/x11-libs/libXv/Manifest +++ b/x11-libs/libXv/Manifest @@ -1 +1,2 @@ DIST libXv-1.0.12.tar.xz 276020 BLAKE2B 567e824b77dd05a9e48f0ff0a4591d7088ee5b681b8822cda6a89c85b14a7471603cc5c80138d0734d7adaf9746610d443013492d10aa2a9efe4749e15e0388c SHA512 bdd00de1ce6a8911056181ab4de32f9e319a68567389162d4bc2e3c9946d5f3c60f87eb6c53f74c9b6a342255e591d5fef4a445a4ac8ca3c1b6fe87d42c51c1e +DIST libXv-1.0.13.tar.xz 281460 BLAKE2B a906908b95c47b8f5309ef7e3c800d560aaf4121908b351c66880977b1ee26302de2b8004692be25ffdca3d26a179034f9931a120194933aaf85ccc8f6bc91f7 SHA512 80d7a11e6415fbe0fc50c3c2a1abf8f0f2ec38446c9c8d88ff48875cd94b8949cb1028f2ab37476c4b25cbd7eac34dde9132dd998c4e04ea576b95ae411ba946 diff --git a/x11-libs/libXv/libXv-1.0.12.ebuild b/x11-libs/libXv/libXv-1.0.12.ebuild index 90fb520d3408..2a12b2cc2fae 100644 --- a/x11-libs/libXv/libXv-1.0.12.ebuild +++ b/x11-libs/libXv/libXv-1.0.12.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xv library" diff --git a/x11-libs/libXv/libXv-1.0.13.ebuild b/x11-libs/libXv/libXv-1.0.13.ebuild new file mode 100644 index 000000000000..3d72f8daa912 --- /dev/null +++ b/x11-libs/libXv/libXv-1.0.13.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +inherit xorg-3 + +DESCRIPTION="X.Org Xv library" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXvMC/libXvMC-1.0.14.ebuild b/x11-libs/libXvMC/libXvMC-1.0.14.ebuild index c375518fb051..93430e9de52b 100644 --- a/x11-libs/libXvMC/libXvMC-1.0.14.ebuild +++ b/x11-libs/libXvMC/libXvMC-1.0.14.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 meson-multilib DESCRIPTION="X.Org XvMC library" diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.6.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.6.ebuild index f4efe5d915da..5078370410e4 100644 --- a/x11-libs/libXxf86dga/libXxf86dga-1.1.6.ebuild +++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.6.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xxf86dga library" diff --git a/x11-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest index aec6416bb92f..db5552e9e657 100644 --- a/x11-libs/libXxf86vm/Manifest +++ b/x11-libs/libXxf86vm/Manifest @@ -1 +1,2 @@ DIST libXxf86vm-1.1.5.tar.xz 265384 BLAKE2B 4e94267ad815cf47ec558959ca122d89b5f8b54ead2b2cb93dc3ef7f9bc694b515978a0b2301bb8e48d32bc768595b50cd8cb71e7a65c65a752699b80c2c079b SHA512 68226fcb9773a583ea417ab413146203dd7db6ff8a4d388285da972353355e11e179861a77c9fa284aefac025bb3bbf5a9537fa0bf246c782e0116a667c9d9b6 +DIST libXxf86vm-1.1.6.tar.xz 271712 BLAKE2B f5d996ad757c51c6d4bb206b8e595b474a79a0569cedc2c6b7cfc4adf4a5c1b4f22cde82e64a74bf468107bbebc2bae69d0e2c5afc7f2512725f482706a64e7e SHA512 7fb3ac4302eea43b70d5106f6c7a113e28e2807da22d2bb7f040e0c4afd322cad4b7f258a5bd6da3940b6b6b39065e1acb218a6dc0ba06b9dd86ea3849231266 diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild index ccb688ac6ef3..e983409be891 100644 --- a/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild +++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.5.ebuild @@ -5,7 +5,6 @@ EAPI=8 XORG_DOC=doc XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org Xxf86vm library" diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.6.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.6.ebuild new file mode 100644 index 000000000000..b2f93a3265e5 --- /dev/null +++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.6.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_DOC=doc +XORG_MULTILIB=yes +inherit xorg-3 + +DESCRIPTION="X.Org Xxf86vm library" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris" + +RDEPEND=" + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libdrm/libdrm-2.4.124.ebuild b/x11-libs/libdrm/libdrm-2.4.124.ebuild index 25b11549579e..e8066e525e64 100644 --- a/x11-libs/libdrm/libdrm-2.4.124.ebuild +++ b/x11-libs/libdrm/libdrm-2.4.124.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ DESCRIPTION="X.Org libdrm library" HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" if [[ ${PV} != 9999* ]]; then SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" fi VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" diff --git a/x11-libs/libfm/libfm-1.3.2-r1.ebuild b/x11-libs/libfm/libfm-1.3.2-r1.ebuild index 63012f59c6ff..a7a8cf69eb63 100644 --- a/x11-libs/libfm/libfm-1.3.2-r1.ebuild +++ b/x11-libs/libfm/libfm-1.3.2-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 MY_P="${PN}-${PV/_/}" -inherit autotools vala xdg +inherit autotools flag-o-matic vala xdg DESCRIPTION="Library for file management" HOMEPAGE="https://wiki.lxde.org/en/PCManFM" @@ -85,6 +85,9 @@ EOF } src_configure() { + # bug #944077 + append-cflags -std=gnu17 + local myeconfargs=( --disable-static --with-html-dir=/usr/share/doc/${PF}/html diff --git a/x11-libs/libfontenc/libfontenc-1.1.8.ebuild b/x11-libs/libfontenc/libfontenc-1.1.8.ebuild index 2f7399aa187a..d4e92c8e9be1 100644 --- a/x11-libs/libfontenc/libfontenc-1.1.8.ebuild +++ b/x11-libs/libfontenc/libfontenc-1.1.8.ebuild @@ -3,7 +3,6 @@ EAPI=8 -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org fontenc library" diff --git a/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild index 2cbc02906c87..b698148f8e09 100644 --- a/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild +++ b/x11-libs/libpciaccess/libpciaccess-0.18.1.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 meson-multilib DESCRIPTION="Library providing generic access to the PCI bus and devices" diff --git a/x11-libs/libxcb/libxcb-1.17.0.ebuild b/x11-libs/libxcb/libxcb-1.17.0.ebuild index 4ba5fd8c6cbc..bc248eb31888 100644 --- a/x11-libs/libxcb/libxcb-1.17.0.ebuild +++ b/x11-libs/libxcb/libxcb-1.17.0.ebuild @@ -6,7 +6,6 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) PYTHON_REQ_USE="xml(+)" -XORG_TARBALL_SUFFIX="xz" XORG_MULTILIB=yes XORG_DOC=doc diff --git a/x11-libs/libxcvt/Manifest b/x11-libs/libxcvt/Manifest index 328ad3356fdd..4a3cde2c810b 100644 --- a/x11-libs/libxcvt/Manifest +++ b/x11-libs/libxcvt/Manifest @@ -1 +1,2 @@ DIST libxcvt-0.1.2.tar.xz 9648 BLAKE2B 8a4803eb6790fd0ea1520fd31e335f7a363c3606e74837a959453be8819ce0d450af7bb651887a891aa657a5eeac3e4983041060fa5c87b1238c83354e425de7 SHA512 3f6b2baca712a4608780686932f8881255c07bb74b1a788f9b07d4e22975c038d75111cd6b452257882a0b2bad57eebb2002f80a3e435d2e2d16936597f039b0 +DIST libxcvt-0.1.3.tar.xz 9680 BLAKE2B ae104743153077454ba8923d7b8bbe77d834e4795fd735de9e42617c3e49fd63052ad37214e7ab45e3f5884cd6038b60c0ff7c52f8a7892e0dea4630aaf0abad SHA512 2fecc784375e69b6e8e46608618a5f5a8ad20ecd5229fd093883fe401dd6ea231d8b77c6753756fff01f3040bef2db60a042d40fc349769ef5348e5cd9ed1f28 diff --git a/x11-libs/libxcvt/libxcvt-0.1.2.ebuild b/x11-libs/libxcvt/libxcvt-0.1.2.ebuild index ee05e94d1712..5fd59096c18e 100644 --- a/x11-libs/libxcvt/libxcvt-0.1.2.ebuild +++ b/x11-libs/libxcvt/libxcvt-0.1.2.ebuild @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 meson diff --git a/x11-libs/libxcvt/libxcvt-0.1.3.ebuild b/x11-libs/libxcvt/libxcvt-0.1.3.ebuild new file mode 100644 index 000000000000..1653d2ad10a4 --- /dev/null +++ b/x11-libs/libxcvt/libxcvt-0.1.3.ebuild @@ -0,0 +1,17 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit xorg-3 meson + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +fi + +DESCRIPTION="X.Org xcvt library and cvt program" + +# Override xorg-3's src_prepare +src_prepare() { + default +} diff --git a/x11-libs/libxcvt/libxcvt-9999.ebuild b/x11-libs/libxcvt/libxcvt-9999.ebuild index 448beec53a04..1653d2ad10a4 100644 --- a/x11-libs/libxcvt/libxcvt-9999.ebuild +++ b/x11-libs/libxcvt/libxcvt-9999.ebuild @@ -1,8 +1,7 @@ -# Copyright 2021-2022 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 meson @@ -12,8 +11,6 @@ fi DESCRIPTION="X.Org xcvt library and cvt program" -RDEPEND="!<x11-base/xorg-server-1.20.11-r3" - # Override xorg-3's src_prepare src_prepare() { default diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild index b76d29df6d96..76ab1d7391e7 100644 --- a/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild +++ b/x11-libs/libxkbfile/libxkbfile-1.1.3.ebuild @@ -3,7 +3,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org xkbfile library" diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest index 1bc5e961ebd7..0e1e0d6fbee5 100644 --- a/x11-libs/libxshmfence/Manifest +++ b/x11-libs/libxshmfence/Manifest @@ -1 +1,2 @@ DIST libxshmfence-1.3.2.tar.xz 259024 BLAKE2B 2f0ef0767fbb29349acf43b4cb4d7177956c06c389f0443db06e398c4e0f3b424432ce6fe8946d70fdd59b9446c53bf2f1ee126df4d41b3065f1e94438facecf SHA512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c +DIST libxshmfence-1.3.3.tar.xz 264860 BLAKE2B 3c06005fdb3419b0baf2cdb1e8ac0099ce7500c87b6ed6fb641d668eb51822d4bb8cd6a79492655fef4e0472a3d0c67a9cb0e12431d19fab779b04da9816b9e1 SHA512 2261b840ea621cf4ce31961ec9df17aa2e253b268afe289dfb97c240aee27b9f443fe36de5de52a2e1210b69092efde21871e20556bac9b4f1d8a3ead1b4c498 diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild index e2bd6b73a3cb..d28ca9b51e9f 100644 --- a/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild +++ b/x11-libs/libxshmfence/libxshmfence-1.3.2.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="Shared memory fences using futexes" diff --git a/x11-libs/libxshmfence/libxshmfence-1.3.3.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3.3.ebuild new file mode 100644 index 000000000000..f49c7bf9b6de --- /dev/null +++ b/x11-libs/libxshmfence/libxshmfence-1.3.3.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=yes +inherit xorg-3 + +DESCRIPTION="Shared memory fences using futexes" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris" + +DEPEND="x11-base/xorg-proto" diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest index 7f3b0ef8668b..7a6de0881c2d 100644 --- a/x11-libs/pango/Manifest +++ b/x11-libs/pango/Manifest @@ -1,2 +1,3 @@ DIST pango-1.52.1.tar.xz 1956856 BLAKE2B 0b7f58f3d74bd37df285f3fbf14d2d2d776fbcf773568d63f12f26976d2ff505c19616fcee11562933df2594762e9ca30fe96a1d02dcd174381b976d63c68ac1 SHA512 7cddbd61afc3c98ffd09ea08c5d7613e454b6705f72304cb9b3578865b6bda70ca20f98605dea73f2cbca5e264217c8d79e4539e9eb36b8775d5d2a4f769cf32 DIST pango-1.52.2.tar.xz 1963588 BLAKE2B 9367703addcc6805fc14f0c0184d9d1b4093b8947fea9d260c54eb6c86ce56a0d6cfe35c3d6340eaa5d96fb84f0a94c5979ae308bfa79f02e4ce25c4c093556e SHA512 6b3d762d133e7c900c6dfa85f43c950699930f6149cb3c90bf0e787f1b5a126a0b90220b90e649f84e4c244e44c46d4b575d5d7afeb305232c333712effc0981 +DIST pango-1.54.0.tar.xz 1963180 BLAKE2B 92c389ab3f21631c245575e30804ffee6fef7b60bc6acdf08159aa325d878cf335203267720aec9143ea2a4e590578424cd64011f73da22e1b0beca85e85a276 SHA512 b08792a811e033b2dc9ae78278ea522fad1064de3a4d33460271eb0502613ee21d2c82349f8e7d8f59d59e0c020b7a3a8efa194572e16e2e78db422956fd97ea diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml index dfaa55f180f5..4882f116d6ea 100644 --- a/x11-libs/pango/metadata.xml +++ b/x11-libs/pango/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> + <flag name="examples">Install source code examples</flag> <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag> <flag name="X">Build and install the legacy pangoxft library</flag> </use> diff --git a/x11-libs/pango/pango-1.54.0.ebuild b/x11-libs/pango/pango-1.54.0.ebuild new file mode 100644 index 000000000000..7054129b4593 --- /dev/null +++ b/x11-libs/pango/pango-1.54.0.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic gnome2-utils meson-multilib xdg + +DESCRIPTION="Internationalized text layout and rendering library" +HOMEPAGE="https://pango.gnome.org/ https://gitlab.gnome.org/GNOME/pango" +SRC_URI="https://download.gnome.org/sources/pango/$(ver_cut 1-2)/${P}.tar.xz" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + +IUSE="debug examples +introspection sysprof test X" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}] + >=dev-libs/fribidi-1.0.6[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.13.0:1.0[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.10[X?,${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + dev-util/glib-utils + sys-apps/help2man + virtual/pkgconfig + test? ( media-fonts/cantarell ) +" + +src_prepare() { + default + xdg_environment_reset + gnome2_environment_reset + + # get rid of a win32 example + rm examples/pangowin32tobmp.c || die +} + +multilib_src_configure() { + if use debug; then + append-cflags -DPANGO_ENABLE_DEBUG + else + append-cflags -DG_DISABLE_CAST_CHECKS + fi + + local emesonargs=( + # Never use gi-docgen subproject + --wrap-mode nofallback + + -Ddocumentation=false # we ship pregenerated docs + $(meson_native_use_feature introspection) + $(meson_use test build-testsuite) + -Dbuild-examples=false + -Dfontconfig=enabled + $(meson_feature sysprof) + -Dlibthai=disabled + -Dcairo=enabled + $(meson_feature X xft) + -Dfreetype=enabled + ) + meson_src_configure +} + +multilib_src_install_all() { + if use examples; then + dodoc -r examples + fi + + insinto /usr/share/gtk-doc/html + # This will install PangoXft API docs regardless of USE=-X, but this is intentional + doins -r "${S}"/docs/Pango* +} + +pkg_postinst() { + xdg_pkg_postinst + + if has_version 'media-libs/freetype[-harfbuzz]' ; then + ewarn "media-libs/freetype is installed without harfbuzz support. This may" + ewarn "lead to minor font rendering problems, see bug 712374." + fi +} diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest index bfde765424ca..18bc0c38ede3 100644 --- a/x11-libs/pixman/Manifest +++ b/x11-libs/pixman/Manifest @@ -1,3 +1,2 @@ DIST pixman-0.43.4.tar.xz 636900 BLAKE2B c31e5700bfadcd72f522af50509a4a6cd7bbf90c918c75b108e50246f1c76e858125138902a222040ada192710ec788deb43eb65085416f3eff88e3ed970933e SHA512 b40fb05bd58dc78f4e4e9b19c86991ab0611b708657c9a7fb42bfe82d57820a0fde01a34b00a0848a41da6c3fb90c2213942a70f435a0e9467631695d3bc7e36 -DIST pixman-0.44.0.tar.xz 649200 BLAKE2B ea3f5fc5e6febfd3e6acf89b9bb7ce2d7c82d42ede2b3f7df69ce6d65ec2d75d3402523a1a3227135caac34633556dec3010a435ace23f2c8255ea210c03d5db SHA512 3ea293cd308a4faeb600939df2c98148154cf1faf8e435b9f33df46c33acfeb32572cb0c1e148ee9f6f39f9e8a49fbda627edcac03da2000d89e22941849a04d DIST pixman-0.44.2.tar.xz 650012 BLAKE2B 856aa35ae705de522d70250beee8acc872b54d2b5caa9cee6bc12ffde7c293b3db76f56c75858cc5ab1bc592fb1d4078485c2def2ae4bcd5a50b6dfc2eb477eb SHA512 b24907f9a0bf6a9aa3278d31986c562c5f2d68f8c178021497c8648aca9f91e4c6f1ecfacf93eb01ba4f03ce4cfc5970fc40bb0fe6724bac9210fc57da09cba4 diff --git a/x11-libs/pixman/pixman-0.44.0.ebuild b/x11-libs/pixman/pixman-0.44.0.ebuild deleted file mode 100644 index 456ea42b8574..000000000000 --- a/x11-libs/pixman/pixman-0.44.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs - -DESCRIPTION="Low-level pixel manipulation routines" -HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" -if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" - SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="cpu_flags_ppc_altivec cpu_flags_arm_neon loongson2f cpu_flags_x86_mmxext cpu_flags_x86_sse2 cpu_flags_x86_ssse3 static-libs test" -RESTRICT="!test? ( test )" - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp -} - -pkg_setup() { - [[ ${MERGE_TYPE} != binary ]] && use test && tc-check-openmp -} - -multilib_src_configure() { - local emesonargs=( - $(meson_feature cpu_flags_x86_mmxext mmx) - $(meson_feature cpu_flags_x86_sse2 sse2) - $(meson_feature cpu_flags_x86_ssse3 ssse3) - $(meson_feature cpu_flags_ppc_altivec vmx) - $(meson_feature loongson2f loongson-mmi) - $(meson_feature test openmp) # only used in unit tests - $(meson_feature test tests) - -Ddefault_library=$(usex static-libs both shared) - -Ddemos=disabled - -Dgtk=disabled - -Dlibpng=disabled - ) - - if [[ ${ABI} == arm64 ]]; then - emesonargs+=($(meson_feature cpu_flags_arm_neon a64-neon)) - elif [[ ${ABI} == arm ]]; then - emesonargs+=($(meson_feature cpu_flags_arm_neon neon)) - fi - - meson_src_configure -} - -multilib_src_test() { - export OMP_NUM_THREADS=$(makeopts_jobs) - meson_src_test -t 100 -} diff --git a/x11-libs/pixman/pixman-0.44.2.ebuild b/x11-libs/pixman/pixman-0.44.2.ebuild index 93d314369ccb..7dbb4e17df15 100644 --- a/x11-libs/pixman/pixman-0.44.2.ebuild +++ b/x11-libs/pixman/pixman-0.44.2.ebuild @@ -14,7 +14,7 @@ inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs DESCRIPTION="Low-level pixel manipulation routines" HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/" if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz" fi diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest deleted file mode 100644 index 09e9c9da5a6a..000000000000 --- a/x11-libs/qwtpolar/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST qwtpolar-1.1.1.tar.bz2 565546 BLAKE2B 7067a006c44d49fab1dc16e115c528aaf72fa172d92487bd38e112bdff99e8ea4d83f0dafcb7f17af4bad9190c809468e47db652ca712645504b350dc9f03ed3 SHA512 5b752e5426ae15740737277c2ba244cab947c54d573b4eedd1f54359b6eab1fa738d40f68f6c806106d01596eabc9f6d7ee825dde11a4925bebd643f42021621 diff --git a/x11-libs/qwtpolar/metadata.xml b/x11-libs/qwtpolar/metadata.xml deleted file mode 100644 index 388d8d5fbf96..000000000000 --- a/x11-libs/qwtpolar/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sci-geosciences@gentoo.org</email> - <name>Gentoo Geosciences Project</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">qwtpolar</remote-id> - </upstream> -</pkgmetadata> diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1-r4.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1-r4.ebuild deleted file mode 100644 index aa82b64f48e4..000000000000 --- a/x11-libs/qwtpolar/qwtpolar-1.1.1-r4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qmake-utils - -DESCRIPTION="Library for displaying values on a polar coordinate system" -HOMEPAGE="https://qwtpolar.sourceforge.io/" -SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2" - -LICENSE="qwt" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - <x11-libs/qwt-6.2:6=[designer,qt5(+),svg,-polar(-)] -" -DEPEND="${RDEPEND} - dev-qt/qtconcurrent:5 -" - -src_prepare() { - default - - local qtplugindir="${EPREFIX}$(qt5_get_plugindir)" - - sed \ - -e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \ - -e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \ - -e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \ - -e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${qtplugindir}/designer/:g" \ - -e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${qtplugindir}/features/:g" \ - -e "/= QwtPolarDesigner/ d" \ - -e "/= QwtPolarExamples/d" \ - -i ${PN}config.pri || die - - sed \ - -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \ - -i src/src.pro || die - echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro - cat >> designer/designer.pro <<- EOF - INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6 - LIBS += -L"${S}/$(get_libdir)" - EOF -} - -src_configure() { - eqmake5 -} - -src_install() { - emake DESTDIR="${D}" INSTALL_ROOT="${D}" install - einstalldocs -} diff --git a/x11-libs/vte/vte-0.76.3.ebuild b/x11-libs/vte/vte-0.76.3.ebuild index 24417459a815..9b72b864a7c2 100644 --- a/x11-libs/vte/vte-0.76.3.ebuild +++ b/x11-libs/vte/vte-0.76.3.ebuild @@ -20,7 +20,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-3+ GPL-3+" SLOT="2.91" # vte_api_version in meson.build -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla" REQUIRED_USE=" gtk-doc? ( introspection ) diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild index f86ce73edfd8..9e5ecc8f2ed4 100644 --- a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild +++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.5.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X C-language Bindings sample implementations" diff --git a/x11-libs/xcb-util-errors/xcb-util-errors-1.0.1-r1.ebuild b/x11-libs/xcb-util-errors/xcb-util-errors-1.0.1-r1.ebuild index 40ad9195c73a..b814f2685818 100644 --- a/x11-libs/xcb-util-errors/xcb-util-errors-1.0.1-r1.ebuild +++ b/x11-libs/xcb-util-errors/xcb-util-errors-1.0.1-r1.ebuild @@ -5,7 +5,6 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -XORG_TARBALL_SUFFIX="xz" inherit python-any-r1 xorg-3 DESCRIPTION="Library that gives human readable names to XCB error, event, & request codes" diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild index 38d7ff6dd02c..2112676a22ce 100644 --- a/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild +++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.1.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X C-language Bindings sample implementations" diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild index e5e650be09c8..8757e2d09124 100644 --- a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild +++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.1.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X C-language Bindings sample implementations" diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild index 649f154f6d41..f8dd96b74c39 100644 --- a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild +++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.10.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X C-language Bindings sample implementations" diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild index 54fb910ae646..3b342e6cd583 100644 --- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild +++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.2.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X C-language Bindings sample implementations" diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r2.ebuild index 8bda1a04bbb9..f020851ebb61 100644 --- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild +++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 XORG_MULTILIB=yes inherit xorg-3 diff --git a/x11-libs/xcb-util/xcb-util-0.4.1.ebuild b/x11-libs/xcb-util/xcb-util-0.4.1.ebuild index 1d8a92690cc0..eff567745efb 100644 --- a/x11-libs/xcb-util/xcb-util-0.4.1.ebuild +++ b/x11-libs/xcb-util/xcb-util-0.4.1.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=yes -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X C-language Bindings sample implementations" diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest index 1680291dab2a..adc41fd6011c 100644 --- a/x11-libs/xtrans/Manifest +++ b/x11-libs/xtrans/Manifest @@ -1,3 +1 @@ -DIST xtrans-1.5.0.tar.xz 170388 BLAKE2B a07dc501a36f4a6d7d9c407c36c5fcaa9555eeec3066d91fa8531118ac04bc55a1fbdce6370782aa8a18e1f26b14e3ad644e1e98ae3a353234e3ecae71fe065b SHA512 e8091f11d4ad2b14e01de3eac56bdf2267ea26687ce66e3056374d0d02e049480c0b27c482f8828a0efd086f1e4c485108ca4dce3f83d66c1896effa3b38b228 -DIST xtrans-1.5.1.tar.xz 175624 BLAKE2B 5ab6ffdc0028da16b4373f824c9bfc51db9bb90bc593c101b2647496846687fd020423e4eb204e8b261fa39123f5a57338b9257b13b7abb92e8d1a49cd3c3345 SHA512 1a4bf3495ba401711b632972acf26bb82c2e8fd917a868ed21e510a1bb1ec57c145496baddb44de76e00c2d03dbf9e8592099623da4c065de3a7c5a804e87c1e DIST xtrans-1.5.2.tar.xz 176680 BLAKE2B 6381257bfc489767438e76afe9bab5e9f143e7524417de0396c0d04e42f1ee7ef28cec6fee83a68f60d3d82326c824f1baa9e58c47f7108e4a4d5dc9a2daa65a SHA512 4c4909402cb7df0d69bf2801722de822f7e376d585ff5aa8db8f88be77ed7fb7dfbdc410827069fc5041327e81afeb9d403c6c92e5c1e02d593c829ef6c37536 diff --git a/x11-libs/xtrans/xtrans-1.5.0.ebuild b/x11-libs/xtrans/xtrans-1.5.0.ebuild deleted file mode 100644 index e5050c583f96..000000000000 --- a/x11-libs/xtrans/xtrans-1.5.0.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -XORG_PACKAGE_NAME="lib${PN}" -# this package just installs some .c and .h files, no libraries -XORG_DOC=doc -XORG_TARBALL_SUFFIX="xz" -inherit xorg-3 - -DESCRIPTION="X.Org xtrans library" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -src_configure() { - local XORG_CONFIGURE_OPTIONS=( - $(use_enable doc docs) - $(use_with doc xmlto) - --without-fop - ) - xorg-3_src_configure -} diff --git a/x11-libs/xtrans/xtrans-1.5.1.ebuild b/x11-libs/xtrans/xtrans-1.5.1.ebuild deleted file mode 100644 index bf61d4caccaf..000000000000 --- a/x11-libs/xtrans/xtrans-1.5.1.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -XORG_PACKAGE_NAME="lib${PN}" -# this package just installs some .c and .h files, no libraries -XORG_DOC=doc -XORG_TARBALL_SUFFIX="xz" -inherit xorg-3 - -DESCRIPTION="X.Org xtrans library" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" - -src_configure() { - local XORG_CONFIGURE_OPTIONS=( - $(use_enable doc docs) - $(use_with doc xmlto) - --without-fop - ) - xorg-3_src_configure -} diff --git a/x11-libs/xtrans/xtrans-1.5.2.ebuild b/x11-libs/xtrans/xtrans-1.5.2.ebuild index 9d0f9c3db109..039777a29859 100644 --- a/x11-libs/xtrans/xtrans-1.5.2.ebuild +++ b/x11-libs/xtrans/xtrans-1.5.2.ebuild @@ -6,7 +6,6 @@ EAPI=8 XORG_PACKAGE_NAME="lib${PN}" # this package just installs some .c and .h files, no libraries XORG_DOC=doc -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org xtrans library" |