From 3f559ef486314f9b3b48d48eb303d6be68463af9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Sep 2024 12:28:20 +0100 Subject: gentoo auto-resync : 03:09:2024 - 12:28:20 --- media-gfx/Manifest.gz | Bin 38549 -> 38562 bytes media-gfx/kgraphviewer/Manifest | 5 - .../files/kgraphviewer-2.4.3-highdpi.patch | 24 ---- .../files/kgraphviewer-2.4.3-obsolete-dep.patch | 121 --------------------- .../kgraphviewer-2.4.3-set-startupwmclass.patch | 27 ----- .../kgraphviewer/kgraphviewer-2.4.3-r2.ebuild | 43 -------- media-gfx/plantuml/Manifest | 2 + media-gfx/plantuml/plantuml-1.2024.6.ebuild | 50 +++++++++ 8 files changed, 52 insertions(+), 220 deletions(-) delete mode 100644 media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch delete mode 100644 media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch delete mode 100644 media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch delete mode 100644 media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild create mode 100644 media-gfx/plantuml/plantuml-1.2024.6.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 629bee9d5a52..0fcecce9f147 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest index 5acb5e74ac11..e9225efed34a 100644 --- a/media-gfx/kgraphviewer/Manifest +++ b/media-gfx/kgraphviewer/Manifest @@ -1,8 +1,3 @@ -AUX kgraphviewer-2.4.3-highdpi.patch 577 BLAKE2B bfe4613b9e67cc01bde9ec7f9c9a827fc823f8cb016af2f27e12e75e5865ed847d745ac022deb799946ed1b13d01eeed5c9f9ba2c57f161c2d3ef2940c95469e SHA512 886f044b18a38fd5c73b17be8837af815ebaf82b277068502d16f5e3c64b0fb19b378c9773c408c8c62df52b7d1703c33bf2a662973f5e2fc4f3666a4d7f752d -AUX kgraphviewer-2.4.3-obsolete-dep.patch 4965 BLAKE2B da1924881e582840e533eed3069274b23ea1a335975d1bbe01627970f64ed46b37f1610b0cefb2d7916b500caf1799eb5b52ee6f954c3acd8dc306affc554d2e SHA512 a43b19dbc068f03011b126b1950cd84b58b784c17464ed2b96042a40ccd36c55e7a4806a7ea5092f392db3fdb4e06777eef2dd046a191db75b3a1a207043ebcd -AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd -DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d DIST kgraphviewer-24.08.0.tar.xz 1582636 BLAKE2B 0043a4a77cf202d96c9e7e0f708e8d93bb71642ba220aa32655f671a8ec92b522d2c8914bdde65187bb270117e2d60f1f7b806895d337c443d7a91860a01f9c3 SHA512 c2ba1a82240fdbbd285b4815d6cc43804e7b26f856185b2d9b3a789e30c6a32c98bd8c92676db3007a58426cbc5961d0bcbf3f4d9c9aa4aed1c58ab12f68f51e -EBUILD kgraphviewer-2.4.3-r2.ebuild 1097 BLAKE2B 312301205617180031aafc740d5749cdb436f601047e2433992d5f376c1b3e82e56dc8137a106faea8131da322dfcd6f2d6b392ad39009dcde368256d3212da7 SHA512 47208d70b25113a5d53168923bdcf16b03230758ace49fcca01fe071102f3f95b382f293c17e422c4ea6a8f6a764ea80c86e60ec5c6e107af0d106a41f00e38e EBUILD kgraphviewer-24.08.0.ebuild 849 BLAKE2B f0c2391b502f1ebde86f9515942bed34686eb57c15057a4c115eb48371da601cb2ef60d2208a180b30371fa3a87bd7d02a1a6a92e26851b658a7b0075a761078 SHA512 59827fef87d9cbc218e84f3fe2cc93b2601ab5e108dc7e6a7fc812d60ea6264454f77ae148e667e380aedafec37b6a4ed89cee8d189107fa029de9cf07096015 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch deleted file mode 100644 index 8b31d40fb157..000000000000 --- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-highdpi.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9961c92736abfc6d0aedea9c4e7c679e1fd564d2 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Mon, 7 Mar 2022 19:49:21 +0100 -Subject: [PATCH] Enable highdpi pixmaps - ---- - src/main.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/main.cpp b/src/main.cpp -index 32ad115..271e61f 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -38,6 +38,7 @@ - - int main(int argc, char **argv) - { -+ QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - QApplication app(argc, argv); - - KLocalizedString::setApplicationDomain("kgraphviewer"); --- -GitLab - diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch deleted file mode 100644 index 76fa878bc364..000000000000 --- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-obsolete-dep.patch +++ /dev/null @@ -1,121 +0,0 @@ -From a6f0587d8cbbb246c33423d19f2aabf6ea9d7417 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sun, 8 May 2022 16:59:25 +0200 -Subject: [PATCH] Remove pointless/broken icons - -The distribute-horizontal-page icon doesn't serve any apparent purpose - -The portrait/landscape icons don't exist in any theme - -(cherry picked from commit 7b214252ec5f486912944d987581f207c7b03681) ---- - CMakeLists.txt | 1 - - src/part/CMakeLists.txt | 2 +- - src/part/KgvPageLayoutSize.cpp | 10 ---------- - src/part/simpleprintingpagesetup.cpp | 4 ---- - src/part/simpleprintingpagesetupbase.ui | 10 ---------- - 5 files changed, 1 insertion(+), 26 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd715d2..238a9dd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,7 +27,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - DocTools - Parts - WidgetsAddons -- IconThemes - ) - - find_package(Boost 1.36 REQUIRED) -diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt -index 0e70be8..922e5c5 100644 ---- a/src/part/CMakeLists.txt -+++ b/src/part/CMakeLists.txt -@@ -64,7 +64,7 @@ ki18n_wrap_ui(kgraphviewerlib_LIB_SRCS ${kgraphviewerprinting_UI} ) - - add_library(kgraphviewerlib ${kgraphviewerlib_LIB_SRCS}) - --target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::IconThemes KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES}) -+target_link_libraries(kgraphviewerlib Qt5::Core Qt5::Svg Qt5::PrintSupport Qt5::Svg KF5::WidgetsAddons KF5::XmlGui KF5::I18n KF5::Parts ${graphviz_LIBRARIES}) - - set_target_properties(kgraphviewerlib PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${KGRAPHVIEWER_SOVERSION} OUTPUT_NAME kgraphviewer ) - -diff --git a/src/part/KgvPageLayoutSize.cpp b/src/part/KgvPageLayoutSize.cpp -index bb8b3d1..4053a20 100644 ---- a/src/part/KgvPageLayoutSize.cpp -+++ b/src/part/KgvPageLayoutSize.cpp -@@ -42,7 +42,6 @@ - #include - #include - #include --#include - #include "klocalizedstring.h" - - KgvPageLayoutSize::KgvPageLayoutSize( -@@ -148,19 +147,10 @@ KgvPageLayoutSize::KgvPageLayoutSize( - // m_orientGroup->setInsideSpacing( KDialog::spacingHint() ); - grid1->addWidget( m_orientGroup, 2, 0 ); - -- const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small); -- QLabel* lbPortrait = new QLabel( m_orientGroup ); -- lbPortrait->setPixmap( QPixmap( QIcon::fromTheme( "koPortrait" ).pixmap(iconSize, iconSize) ) ); -- lbPortrait->setMaximumWidth( lbPortrait->pixmap()->width() ); -- lay3->addWidget(lbPortrait); - QRadioButton* rbPortrait = new QRadioButton( i18n("&Portrait"), m_orientGroup ); - lay3->addWidget(rbPortrait); - m_orientButtons.addButton(rbPortrait); - -- QLabel* lbLandscape = new QLabel( m_orientGroup ); -- lbLandscape->setPixmap( QPixmap( QIcon::fromTheme( "koLandscape" ).pixmap(iconSize, iconSize) ) ); -- lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() ); -- lay3->addWidget(lbLandscape); - QRadioButton* rbLandscape = new QRadioButton( i18n("La&ndscape"), m_orientGroup ); - lay3->addWidget(rbLandscape); - m_orientGroup->setLayout(lay3); -diff --git a/src/part/simpleprintingpagesetup.cpp b/src/part/simpleprintingpagesetup.cpp -index 9882fbf..cd707b9 100644 ---- a/src/part/simpleprintingpagesetup.cpp -+++ b/src/part/simpleprintingpagesetup.cpp -@@ -57,7 +57,6 @@ - #include - #include - #include --#include - #include - - namespace KGraphViewer -@@ -109,9 +108,6 @@ KGVSimplePrintingPageSetup::KGVSimplePrintingPageSetup( - connect(m_contents->printPreviewButton, &QPushButton::clicked, - this, &KGVSimplePrintingPageSetup::slotPrintPreview); - -- m_contents->iconLabel->setFixedWidth(32+6); -- const int iconSize = KIconTheme(KIconTheme::current()).defaultSize(KIconLoader::Small); -- m_contents->iconLabel->setPixmap(QIcon::fromTheme("distribute-horizontal-page").pixmap(iconSize, iconSize)); - m_contents->headerTitleFontButton->setText(i18n("Font...")); - m_contents->headerTitleFontButton->setWhatsThis(i18n("Changes font for title text.")); - connect(m_contents->headerTitleFontButton, &QPushButton::clicked, -diff --git a/src/part/simpleprintingpagesetupbase.ui b/src/part/simpleprintingpagesetupbase.ui -index ddc6ee0..719a7d6 100644 ---- a/src/part/simpleprintingpagesetupbase.ui -+++ b/src/part/simpleprintingpagesetupbase.ui -@@ -157,16 +157,6 @@ - - - -- -- -- -- -- -- -- Qt::AlignVCenter -- -- -- - - - --- -2.37.3 - diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch deleted file mode 100644 index 970bf57f2cfb..000000000000 --- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 50fea8d6413e06fcfaf0d0ca03cc6c266a1cda14 Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" -Date: Tue, 5 Feb 2019 04:49:16 +0100 -Subject: Set StartupWMClass in desktop file - -Used by non-Plasma unixoid X-based shells to map windows to desktop files -e.g. in launcher UIs, which do not know about _KDE_NET_WM_DESKTOP_FILE and -instead expect (one of) the WM_CLASS entries to match the basename of the -desktop file by default. StartupWMClass overwrites that default. ---- - src/org.kde.kgraphviewer.desktop | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/org.kde.kgraphviewer.desktop b/src/org.kde.kgraphviewer.desktop -index bfff1bf..6b3affb 100644 ---- a/src/org.kde.kgraphviewer.desktop -+++ b/src/org.kde.kgraphviewer.desktop -@@ -41,6 +41,7 @@ MimeType=text/vnd.graphviz - Exec=kgraphviewer -qwindowtitle %c %u - Icon=kgraphviewer - Type=Application -+StartupWMClass=kgraphviewer - Categories=Qt;KDE;Graphics;Viewer;2DGraphics;DataVisualization; - X-DocPath=kgraphviewer/index.html - InitialPreference=10 --- -cgit v1.1 diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild deleted file mode 100644 index 4716b8e8e2e9..000000000000 --- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.60.0 -QTMIN=5.12.3 -inherit ecm kde.org - -DESCRIPTION="Graphviz dot graph file viewer" -HOMEPAGE="https://apps.kde.org/kgraphviewer" -[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )" -SLOT="5" -KEYWORDS="amd64 arm64 x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=media-gfx/graphviz-2.30 -" -DEPEND="${RDEPEND} - dev-libs/boost -" - -PATCHES=( - "${FILESDIR}/${P}-set-startupwmclass.patch" - "${FILESDIR}/${P}-highdpi.patch" - "${FILESDIR}/${P}-obsolete-dep.patch" -) diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest index 1b8f7dba26d8..b917a99b6fe7 100644 --- a/media-gfx/plantuml/Manifest +++ b/media-gfx/plantuml/Manifest @@ -1,3 +1,5 @@ DIST plantuml-1.2024.5.tar.gz 12119170 BLAKE2B 97fd8f48aa04d9d8b089547871abd954b8b1c189d32b844f1de4ac33678dabe2968a3307fb573f571adf541dbbbfd5eb5c21839b14f3cb9ed2e86ac7b447bb87 SHA512 20b9502a3d6ac9ceccb667943f8ea70990102f778175001852b1fcd2b9b7fa570f5b7a7fb237b6831c0411667c3e986f2b0ea09ce2602b5c1ca98694b37c20a5 +DIST plantuml-1.2024.6.tar.gz 12591935 BLAKE2B c9b56908538e3e98d2c8d4e56c064ffa378621d14232f8d769f1b80b610fcf22c50d94974a8c21791e2780231708e594a02466f0cba5e78a60b4b4110d0f89f0 SHA512 86633b93abdbc571ff335e61992f0db8ba20ed0e0d0dc5e9c564a8b312594051f47d453fb8b9787d3d3192ccc35f8ea99e5ddab8cc1d16458203c9309087ddbd EBUILD plantuml-1.2024.5-r1.ebuild 1379 BLAKE2B d9828453b19199934914faa621789747aea212803c63c48500bc283907359c6c04671ff62c00c0ef17e7accd9e2c948bb354c54d796bb77439a5339bef31c0fe SHA512 6ae5acbbb52f987d5d270c90a8940cad08430f7fd02d61d38cf9850ddd3807f664f78a265a8d2ea2bda054fb728ce603e164a4ecf17eaaae53b39b1b649a04b7 +EBUILD plantuml-1.2024.6.ebuild 1380 BLAKE2B cbfc68c40d4cb2f2db79154facbcd198c44ce49920ba9298eab723b951e89aba7d2a947eff781dc2a258a586db833ca534459b9b8723cc194430a3cdac88a9bd SHA512 32c34377f41bd1deedb2e1b81aec248dc2fc1f7aaa779664094f90abc4f258ec708635eadbac2206a4160ae28d6078b71a5f224dd745a4717d61d40b042e9cb0 MISC metadata.xml 975 BLAKE2B 3a847073b2f3b5f14adb59f8dec5183533eef81f8b10e5633b356743cb45c3927dfc2f8427f26f1e2b3eef01976b0a8e5884b5f9492310e87884c26759dbfed8 SHA512 2cd56c421b1566a679afb739ca82377d5c8b47519fd2cc44307424f5cd88fa0f8b2144842943a7da6abef7ad79254101818292819fdef97631746815a892e7a5 diff --git a/media-gfx/plantuml/plantuml-1.2024.6.ebuild b/media-gfx/plantuml/plantuml-1.2024.6.ebuild new file mode 100644 index 000000000000..eafb36810423 --- /dev/null +++ b/media-gfx/plantuml/plantuml-1.2024.6.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +inherit java-pkg-2 java-pkg-simple desktop xdg + +DESCRIPTION="Draw UML diagrams using a simple and human readable text description" +HOMEPAGE="https://plantuml.com" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ant-task" + +DEPEND=">=virtual/jdk-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" +RDEPEND=">=virtual/jre-1.8:* + media-gfx/graphviz + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" + +JAVA_AUTOMATIC_MODULE_NAME="net.sourceforge.plantuml" +JAVA_MAIN_CLASS="net.sourceforge.plantuml.Run" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src" + +src_prepare() { + java-pkg-2_src_prepare + if use ant-task; then + # src/net/sourceforge/plantuml/ant/readme.md + JAVA_GENTOO_CLASSPATH+="ant" + else + rm src/net/sourceforge/plantuml/ant/{CheckZip,PlantUml}Task.java || die + fi + + # java-pkg-simple wants resources in a separate directory + cp -r src res || die + cp -r skin stdlib svg themes res || die + find res -type f \( -name '*.java' -o -iname 'readme.md' \ + -o -name '*.ttf' -o -name '*.html' -o -name 'data.txt' \ + -o -name '.editorconfig' \) -exec rm -rf {} + || die +} + +src_install() { + java-pkg-simple_src_install + make_desktop_entry plantuml +} -- cgit v1.2.3