From d0fafa709f2b77dc0e70c99118520000965e4b5a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Mar 2024 17:43:01 +0000 Subject: gentoo auto-resync : 04:03:2024 - 17:43:01 --- app-office/Manifest.gz | Bin 8428 -> 8429 bytes app-office/scribus/Manifest | 8 - .../scribus/files/scribus-1.5.6-docdir.patch | 27 ---- .../scribus/files/scribus-1.5.6-findhyphen.patch | 19 --- .../scribus/files/scribus-1.5.8-findhyphen-1.patch | 50 ------ .../scribus/files/scribus-1.5.8-python-3.12.patch | 32 ---- app-office/scribus/scribus-1.5.8-r6.ebuild | 171 --------------------- 7 files changed, 307 deletions(-) delete mode 100644 app-office/scribus/files/scribus-1.5.6-docdir.patch delete mode 100644 app-office/scribus/files/scribus-1.5.6-findhyphen.patch delete mode 100644 app-office/scribus/files/scribus-1.5.8-findhyphen-1.patch delete mode 100644 app-office/scribus/files/scribus-1.5.8-python-3.12.patch delete mode 100644 app-office/scribus/scribus-1.5.8-r6.ebuild (limited to 'app-office') diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz index ffa08618fbd2..850a05892bf4 100644 Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index bbb5080a1170..188b7ed82793 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,19 +1,11 @@ AUX scribus-1.5.3-fpic.patch 376 BLAKE2B 102f6ca21c96d0b05354bf65c551efde01291c1b878db27e24ee8680eca6bebc9e402b19d62fe2001ed5dfc46ca11c3b3450816a017c942ba848bd43476628fc SHA512 531c3697983adbdeef4959c44a89ccf5e3802f2b1e64a65a63747a659cb808a08095d7592e6f8974e3e0e16ad913ba05bd3f3fe9c9fbd0a50463fd8df6f47d34 -AUX scribus-1.5.6-docdir.patch 1004 BLAKE2B dc194b58f5ab684d2ac34eead4d83a4d7af6aa2a4b703cdeb79845c3403545f646868e58711c10f2d1c2bf863bd12279b014f2d5f61c3e78e57eebb6707d30ee SHA512 ab3af6abaeb64970a9a545e9c59987cc04a8f6720f646fac9d7ac5abc349e6531a990b12614dfe9dc9f8b113dc2d3eb700a0aa39516cdf862124c3f61ede5f74 -AUX scribus-1.5.6-findhyphen.patch 525 BLAKE2B ae918725d9ae7754a242d3d9a0c1d3f5f9c9ef4b44d5af6d9d5b335e642a9d33720f3127f53fcb4469657bc82b6b5cd8a0dfb1baed49fc3c7e780aa795468504 SHA512 69b327714428eee7af7f55340199e946125d8f0bd04e2503775930b9237ac9eb89eed6f6782660e0519123d2ce3edebb6c05734017bf420418e3bb7f84246eaf AUX scribus-1.5.8-cmake.patch 951 BLAKE2B 7f64fbb7d92974b44946eeee359a87ea3c1564a804765169f0271d5cbdef488b142eec3d057d0367415b665c09ef82ef4da2934b3343e6bf0f0a91abe949bb23 SHA512 340185ac6ae1a0dbb6138ff2d714ba330ce4957864788a5f7786d7f5149abddcda222e5b902bc67c6ed61bf01dd4225eb66ce6abc5e3a672ef2c0586701384e7 -AUX scribus-1.5.8-findhyphen-1.patch 1086 BLAKE2B 40411dceef883703c2767bb59e5237d0a970028b433b95e8b58bb3b15d308526fb6503fef056756e5241e5f9ec7a0fee327388bda0c2b99e3f01cbb3290a1313 SHA512 5d05c15f38915863bc931328b5bd55cfd66bba0f7859f9312144dd431e0a1b218f7436df506e351a268406094597bdb56a016e7c86f69af53a8db9834cb4195e -AUX scribus-1.5.8-python-3.12.patch 1579 BLAKE2B 67ccc49cc876b709f5cb506e1148c7cd2ee6ddc475a9b0fb897e34fcdf5d52ecb82f8938b73c5e651b6b4008f8923d13c26b2e870fb6b7ee3a734a0e679f984b SHA512 312be33bc12524751cb0ceabfabcf0cf10af2ff7bc91ac765151fa25e66002691501cae1e3478b7938d6a83c1dbebd4e1e1c1c5d1d6792d77a9b6b40d8d19064 AUX scribus-1.6.1-findhyphen.patch 1787 BLAKE2B 28faaa033a876516333ce10f89cc741c56090c53e98b0b9dee44cd05153533b0fd088e178f087f1125365b199385463ae1e07add1a92976e32a8b500d6e2979c SHA512 772ded373a356a679416dcd4f87abaf4b2a47bcf48738a8d40103cadff6eb332381e07bd277c5013c5e112f5b2997b2e9667052b83324960990ce96fa7ec4542 AUX scribus-1.7.0-dont-install-thirdparty-license.patch 517 BLAKE2B cba2d9ad7e3b4a028f75dddb8296d8d5fd8f38c6eb91f673db4fda779375ed7f29e266874a66c9ea7d40c6e54908a2c98397072805cfb6c640c6a0a58b1cfd2a SHA512 8a38b5a1254f089f94f0fc8ca8f646e1c1d76a1193b232bb4420639a725f10cc2204d83c42a6a7535347dc7e2486048311e8221cfb445542b32511cedb07142e AUX scribus-1.7.0-findhyphen.patch 1900 BLAKE2B 6d5ef69a889afefa8449e35cdb4348d9cdf3ebe1b110b4de86a35e72e5faae97ae2fbadfe9ae2672a144d7ccea33ea95e0e25f2894f444c3a58a6e1b713aa357 SHA512 cde9231dd4783832340d9dd3df1522d3f5f7a3ab4f26d18ca5825d634d8102e3ca1bae483f0bd111e7e4fff31e5c9154923a9d79eae735a0445b6829e74b5c5f AUX scribus-1.7.0-fix-icon-version.patch 410 BLAKE2B 65d077457d8c85a8830345d7299b054806c16285e75ed4055f14ba4d844a9b0fd4972f0f1eba6ec889af4f460f50522d88722bfa34b123b80f280f2f0e029462 SHA512 230085c17081a33fb900e686e7469b878965c659e10845c39d2c7dc68a11e1f6a01bd614a21a555539c437a567ac8231490da739bfe5c17ef13fed9bd61352e2 AUX scribus-1.7.0-remove-hello-world-test.patch 239 BLAKE2B c74e2fc5f29d3c1a50b1f9a5c0d4205f7f348191dd3b7cde07d21566e85fcea273369b4d47078d2c19db230693fbe2267497b4b106ad0112e5b37a9f22a259a0 SHA512 88f8195144722b991138115bf398b63f3558c12a3a6d02a65a6520a80a710e67d38338d71dc80006f72e946aebf2eac4c692e23e8a759709aa31100791684f49 -DIST scribus-1.5.8-patchset-1.tar.xz 7396 BLAKE2B f8c7b6eb83bfdca715a46c09f4168db332d52b4d4bdc12946bd3ca88bd9b6c67a22c034b58ca62149cbe483ca75efa646589d367245db68136b0bdbcf91dae20 SHA512 ee9bc984b0593fb2f0e727e45dac12b6d1fd1117d0e42d531ab7a49b55b0d72b5c36fc40709750571eb8c70e19f5b59e69faefa40c5706d82f1b6db18baff28d -DIST scribus-1.5.8-podofo-0.10.tar.xz 19116 BLAKE2B 3aa6ecc6726fece8c3b1645096493615eafc67daf45bb5e5ff56a01e75a08418aaad9cfd67e1de3114b4e1e8dd7478c2be3da63ea29560948ddd5295f586e00e SHA512 7d03cedbdae5147c6f2b662ae8c9bd009d5eb9efcb3087bd841e785b4a4a1942a2811f29d433590022d9dc68f716b8b20c30b818d5c91197cbe79fe3260d0db7 -DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5 SHA512 ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e -EBUILD scribus-1.5.8-r6.ebuild 4442 BLAKE2B 5063e5aa3aa6e1308ba979ea30de783c600f96e05f0d62d6372fd118bb25c49d952e6002227afdc84ea69b89fc6eb9ef7b8e9051b18fafdf1300b1d261195da6 SHA512 98c8604f65e8caefd1e27d136c531da1ad7060e38df66ba979c5dcaf57918f6ddc60222a2187abdb82b77084f8fb536184550cd45f1cd31a8f2b1c3ef0818569 EBUILD scribus-1.6.1-r1.ebuild 3932 BLAKE2B 0700c8f70859e7640ad94d53b971675b15f2eeb41cc91f233574d1e2177a9786171ef6e872689265736823aaa9cf8f9a9a320244ed84c03910492da0a4711737 SHA512 8bd486cd03ca39a440380a9a194da439e875bc17a6ca8f29e20e49bf5b31e3e50fcb5327db015de2f586b90dc41c12631e6b960c302b08424ab7957b8e632efe EBUILD scribus-9999.ebuild 4030 BLAKE2B 52b4aa2873a6deefc274dcc2303b288ba64daad3bbe37c2190e0d07da612f7bc5860a9ffc85a9df2210cf2c316ab8b8ddddd37689748817714cc59c879a8b15e SHA512 e831559052b968976a5e6889883038640fc87c3687e7316690f478b7106720c605c377c059c4d8cc2c97b903de44bb55e1b200b5ea84b39e50dea4cc29c1e3b4 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91 diff --git a/app-office/scribus/files/scribus-1.5.6-docdir.patch b/app-office/scribus/files/scribus-1.5.6-docdir.patch deleted file mode 100644 index 06d878af55fd..000000000000 --- a/app-office/scribus/files/scribus-1.5.6-docdir.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/CMakeLists_Directories.cmake -+++ b/CMakeLists_Directories.cmake -@@ -36,14 +36,16 @@ else() - endif() - - #SHARE - use the default on Apple as TAG_VERSION is empty --if(WIN32 OR OS2) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") --elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") --elseif(NOT WANT_VERSIONING) -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") --else() -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+if(NOT DOCDIR) -+ if(WIN32 OR OS2) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") -+ elseif(TAG_VERSION OR BUILD_OSX_BUNDLE) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") -+ elseif(NOT WANT_VERSIONING) -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") -+ else() -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") -+ endif() - endif() - - if(IS_ABSOLUTE ${DOCDIR} AND WANT_RELOCATABLE) diff --git a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch b/app-office/scribus/files/scribus-1.5.6-findhyphen.patch deleted file mode 100644 index d8e2400ea1f4..000000000000 --- a/app-office/scribus/files/scribus-1.5.6-findhyphen.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/CMakeLists_Dependencies.cmake -+++ b/CMakeLists_Dependencies.cmake -@@ -954,6 +954,16 @@ - endif() - #>>HUNSPELL for Speelling support - -+#<>HYPHEN for Hyphenation support -+ - #< - - #include "scribusapi.h" --#include "third_party/hyphen/hyphen.h" -+#include - - class ScribusDoc; - class ScribusMainWindow; diff --git a/app-office/scribus/files/scribus-1.5.8-python-3.12.patch b/app-office/scribus/files/scribus-1.5.8-python-3.12.patch deleted file mode 100644 index 0e13892c7e26..000000000000 --- a/app-office/scribus/files/scribus-1.5.8-python-3.12.patch +++ /dev/null @@ -1,32 +0,0 @@ -Backport of https://github.com/scribusproject/scribus/commit/065459990d1fe097d4339653c7ba600cc3547523 to fix -https://bugzilla.redhat.com/2155514: Fails to build with Python 3.12: error: 'PyUnicode_AS_UNICODE' -was not declared in this scope. - ---- scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp -+++ scribus-1.5.8/scribus/plugins/scriptplugin/cmdgetsetprop.cpp.python-3.12 -@@ -409,10 +409,8 @@ - success = obj->setProperty(propertyName, QString::fromUtf8(PyBytes_AsString(objValue))); - else if (PyUnicode_Check(objValue)) - { -- // Get a pointer to the internal buffer of the Py_Unicode object, which is UCS2 formatted -- const unsigned short * ucs2Data = (const unsigned short *) PyUnicode_AS_UNICODE(objValue); -- // and make a new QString from it (the string is copied) -- success = obj->setProperty(propertyName, QString::fromUtf16(ucs2Data)); -+ QString qStrValue = PyUnicode_asQString(objValue); -+ success = obj->setProperty(propertyName, qStrValue); - } - else - matched = false; -@@ -429,10 +427,8 @@ - } - else if (PyUnicode_Check(objValue)) - { -- // Get a pointer to the internal buffer of the Py_Unicode object, which is UCS2 formatted -- const unsigned short * utf16Data = (const unsigned short *)PyUnicode_AS_UNICODE(objValue); -- // and make a new QString from it (the string is copied) -- success = obj->setProperty(propertyName, QString::fromUtf16(utf16Data).toLatin1()); -+ QString qStrValue = PyUnicode_asQString(objValue); -+ success = obj->setProperty(propertyName, qStrValue.toLatin1()); - } - else - matched = false; diff --git a/app-office/scribus/scribus-1.5.8-r6.ebuild b/app-office/scribus/scribus-1.5.8-r6.ebuild deleted file mode 100644 index 9dd9b956b095..000000000000 --- a/app-office/scribus/scribus-1.5.8-r6.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PATCHSET=${P}-patchset-1 -PYTHON_COMPAT=( python3_{9..12} ) -PYTHON_REQ_USE="tk?" -inherit cmake desktop flag-o-matic optfeature python-single-r1 xdg - -DESCRIPTION="Desktop publishing (DTP) and layout program" -HOMEPAGE="https://www.scribus.net/" -SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz -https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz -https://dev.gentoo.org/~asturm/distfiles/${P}-podofo-0.10.tar.xz" -S="${WORKDIR}/${P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - tk? ( scripts )" - -# osg -# couple of third_party libs bundled -DEPEND="${PYTHON_DEPS} - app-text/libmspub - app-text/libqxp - app-text/poppler:= - dev-libs/hyphen - dev-libs/icu:0= - dev-libs/librevenge - dev-libs/libxml2 - dev-qt/qtcore:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:0=[icu] - media-libs/lcms:2 - media-libs/libcdr - media-libs/libfreehand - media-libs/libjpeg-turbo:= - media-libs/libpagemaker - media-libs/libpng:0= - media-libs/libvisio - media-libs/libzmf - media-libs/tiff:= - net-print/cups - sys-libs/zlib[minizip] - x11-libs/cairo[X,svg(+)] - boost? ( dev-libs/boost:= ) - graphicsmagick? ( media-gfx/graphicsmagick:= ) - hunspell? ( app-text/hunspell:= ) - osg? ( dev-games/openscenegraph:= ) - pdf? ( app-text/podofo:0= ) - scripts? ( - $(python_gen_cond_dep ' - dev-python/pillow[tk?,${PYTHON_USEDEP}] - ') - ) -" -RDEPEND="${DEPEND} - app-text/ghostscript-gpl -" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -PATCHES=( - # non(?)-upstreamable - "${FILESDIR}"/${PN}-1.5.8-cmake.patch # bug 886251 - "${FILESDIR}"/${PN}-1.5.3-fpic.patch - "${FILESDIR}"/${PN}-1.5.6-docdir.patch - "${FILESDIR}"/${PN}-1.5.8-findhyphen-1.patch - "${FILESDIR}"/${PN}-1.5.6-findhyphen.patch - - # git master; # bug 834537, 843287, 893158 - "${WORKDIR}"/${PATCHSET} - "${WORKDIR}"/${P}-podofo-0.10 # 914493 - "${FILESDIR}"/${P}-python-3.12.patch -) - -src_prepare() { - cmake_src_prepare - - rm -r codegen/cheetah scribus/third_party/hyphen || die - - sed \ - -e "/^\s*unzip\.[ch]/d" \ - -e "/^\s*ioapi\.[ch]/d" \ - -i scribus/CMakeLists.txt Scribus.pro || die - rm scribus/ioapi.[ch] || die - - sed \ - -e 's:\(${CMAKE_INSTALL_PREFIX}\):./\1:g' \ - -i resources/templates/CMakeLists.txt || die - - sed \ - -e "/^add_subdirectory(ui\/qml)/s/^/#DONT/" \ - -i scribus/CMakeLists.txt || die # nothing but a bogus Hello World test -} - -src_configure() { - # bug #550818 - append-cppflags -DHAVE_MEMRCHR - - local mycmakeargs=( - -DHAVE_PYTHON=ON - -DWANT_DISTROBUILD=ON - -DWANT_CPP17=ON - -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ - -DPython3_EXECUTABLE="${PYTHON}" - -DWITH_BOOST=$(usex boost) - -DWANT_DEBUG=$(usex debug) - -DWANT_NOEXAMPLES=$(usex !examples) - -DWANT_GRAPHICSMAGICK=$(usex graphicsmagick) - -DWANT_HUNSPELL=$(usex hunspell) - -DWANT_HEADERINSTALL=$(usex !minimal) - -DWANT_NOOSG=$(usex !osg) - -DWITH_PODOFO=$(usex pdf) - -DWANT_NOTEMPLATES=$(usex !templates) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - if ! use tk; then - rm "${ED}"/usr/share/scribus/scripts/{FontSample,CalendarWizard}.py || die - fi - if use scripts; then - python_fix_shebang "${ED}"/usr/share/scribus/scripts - python_optimize "${ED}"/usr/share/scribus/scripts - else - rm "${ED}"/usr/share/scribus/scripts/*.py || die - fi - - mv "${ED}"/usr/share/doc/${PF}/{en,html} || die - ln -sf html "${ED}"/usr/share/doc/${PF}/en || die - - # These files are parsed to populate the help/about window. - cat >> "${T}"/COPYING <<- EOF || die - ${PN} is licensed under the "${LICENSE}". - Please visit https://www.gnu.org/licenses/gpl-2.0.html for the complete license text. - EOF - dodoc "${T}"/COPYING - docompress -x /usr/share/doc/${PF}/en /usr/share/doc/${PF}/{AUTHORS,TRANSLATION,LINKS,COPYING} - - local size - for size in 16 32 128 256 512; do - newicon -s $size resources/iconsets/artwork/icon_${size}x${size}.png scribus.png - done - newicon -s 64 resources/iconsets/artwork/icon_32x32@2x.png scribus.png - doicon resources/iconsets/*/scribus.png - domenu scribus.desktop -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "MS Word .doc file import filter support" app-text/antiword -} -- cgit v1.2.3