diff options
Diffstat (limited to 'x11-misc')
126 files changed, 972 insertions, 3602 deletions
diff --git a/x11-misc/alacarte/alacarte-3.52.0.ebuild b/x11-misc/alacarte/alacarte-3.52.0.ebuild index 9204609f05b5..adaff6e9295b 100644 --- a/x11-misc/alacarte/alacarte-3.52.0.ebuild +++ b/x11-misc/alacarte/alacarte-3.52.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" DEPEND=" diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest index a4d5f5e7814f..1dc8beae8d60 100644 --- a/x11-misc/compose-tables/Manifest +++ b/x11-misc/compose-tables/Manifest @@ -1 +1,2 @@ DIST libX11-1.8.10.tar.xz 1839380 BLAKE2B 72ff400e1aad5bcb04e5dd3fb43f7767fad47e38cf628382cd5ffd5a204efc4de4f626027dddbbc7e10f80f8eaee0bcdf9792d9d012256366920f7ae0cffcb15 SHA512 f801f5b77cbc55074f73dc95b29fff7b5e1b13b99641f6e397788ad9f31a29793ed4e8e5bd373122c790ef90627e8f9d6d5e271051c1767a479a85c55cd82bc1 +DIST libX11-1.8.11.tar.xz 1817652 BLAKE2B e557548d6acaa417a87600c10f1e295ae0fbb13460f7641260f59fc175e9b7de76b4c398981d76b11a52a055f26b233a2ceb44ebb8076d793eb047c2d178573a SHA512 4e2191258039ad0ea7fe5d22b8b0ab5e1d101b20fa4cd0fb44c5e1ac8b2ffbb3a0ad80ac3a67a3803ca30b972476b739a0c244b2ac8b7de6a32b06dc4e2c674b diff --git a/x11-misc/compose-tables/compose-tables-1.8.10.ebuild b/x11-misc/compose-tables/compose-tables-1.8.10.ebuild index 53c4e8c44bce..3e5342f52cfc 100644 --- a/x11-misc/compose-tables/compose-tables-1.8.10.ebuild +++ b/x11-misc/compose-tables/compose-tables-1.8.10.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MULTILIB=no -XORG_TARBALL_SUFFIX=xz inherit xorg-3 # Note: please bump this with x11-libs/libX11 diff --git a/x11-misc/compose-tables/compose-tables-1.8.11.ebuild b/x11-misc/compose-tables/compose-tables-1.8.11.ebuild new file mode 100644 index 000000000000..12dfb3da5e72 --- /dev/null +++ b/x11-misc/compose-tables/compose-tables-1.8.11.ebuild @@ -0,0 +1,45 @@ +# Copyright 2020-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_MULTILIB=no +inherit xorg-3 + +# Note: please bump this with x11-libs/libX11 +DESCRIPTION="X.Org Compose Key tables from libX11" +# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package +SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}" +S="${WORKDIR}/libX11-${PV}/" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" + +# Only needed by configure +DEPEND=" + x11-base/xorg-proto + >=x11-libs/libxcb-1.11.1 + x11-libs/xtrans" +# RDEPEND="" + +src_configure() { + local XORG_CONFIGURE_OPTIONS=( + --without-xmlto + --without-fop + --disable-specs + --disable-xkb + --with-keysymdefdir="${ESYSROOT}/usr/include/X11" + ) + xorg-3_src_configure +} + +src_compile() { + emake -C nls +} + +src_test() { + :; +} + +src_install() { + emake DESTDIR="${D}" -C nls install +} diff --git a/x11-misc/copyq/Manifest b/x11-misc/copyq/Manifest index 95aaddd98bc5..cdc6b43471af 100644 --- a/x11-misc/copyq/Manifest +++ b/x11-misc/copyq/Manifest @@ -1,2 +1 @@ -DIST copyq-7.1.0.tar.gz 3351093 BLAKE2B 758271f6bb54760372b8b5ab84de7c91af874bd72a22c8c22d338705869eab5500fde90808b4bf1288f8bdbad11163283637b81d85c09ccf0d734286dee605b6 SHA512 4320095ab75c361cc3d553c7817951eb6e74d47223f62bf6c1722e0f0b0d3ff59a1762354cf46fe0de064d516d60a467bff9ad9143b12016fc3f9e62139d3909 DIST copyq-9.1.0.tar.gz 3417507 BLAKE2B 582b532cdc0c01976fa52b01b3656902fc392ce5785145230efe7f42da8920553161e8bd44b1fcbd9ba2f7d4a8169ac017474f1dd8a34874aec1919e442326a6 SHA512 d87964b876de28be860a17490d9816f5224a25565f84916ee4ca39f83d2e7c5d57dafdf9f54667c43fd93d232e1e1f1f32064e6435aad6abab086398e6ae246d diff --git a/x11-misc/copyq/copyq-7.1.0-r1.ebuild b/x11-misc/copyq/copyq-7.1.0-r1.ebuild deleted file mode 100644 index 85ed9029ecee..000000000000 --- a/x11-misc/copyq/copyq-7.1.0-r1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake optfeature virtualx xdg - -DESCRIPTION="Clipboard manager with advanced features" -HOMEPAGE=" - https://hluk.github.io/CopyQ/ - https://github.com/hluk/CopyQ/ -" -SRC_URI="https://github.com/hluk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/CopyQ-${PV}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" - -IUSE="notification qt6 test" -# Native notifications are not supported with Qt 6 -# (Bumpers please check when this requirement is lifted). -# src/notifications.cmake -REQUIRED_USE="notification? ( !qt6 )" - -RDEPEND=" - dev-libs/wayland - x11-libs/libX11 - x11-libs/libXtst - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwayland:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - notification? ( kde-frameworks/knotifications:5 ) - test? ( dev-qt/qttest:5 ) - ) - qt6? ( - dev-qt/qtbase:6=[X,gui,network,widgets,xml(+)] - dev-qt/qtdeclarative:6 - dev-qt/qtsvg:6 - dev-qt/qtwayland:6 - ) -" -DEPEND="${RDEPEND} - x11-base/xorg-proto -" -BDEPEND=" - kde-frameworks/extra-cmake-modules:0 - !qt6? ( - dev-qt/linguist-tools:5 - dev-qt/qtwaylandscanner:5 - ) - qt6? ( - dev-qt/qttools:6[linguist] - dev-util/wayland-scanner - ) - test? ( - app-crypt/gnupg - x11-wm/openbox - ) -" - -PATCHES=( - "${FILESDIR}/copyq-7.1.0-fix-qt-6.6.0-build.patch" - "${FILESDIR}/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch" - "${FILESDIR}/copyq-7.1.0-fix-gpg-2.1-support.patch" - "${FILESDIR}/copyq-7.1.0-support-plugin-dir-envvar-r1.patch" -) - -src_prepare() { - cmake_src_prepare - - # FAIL! : Tests::actionDialogAccept() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE. - # FAIL! : Tests::actionDialogSelection() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE. - # FAIL! : Tests::actionDialogSelectionInputOutput() 'NO_ERRORS(m_test->runClient((Args() << "keys" << actionDialogId << "ENTER" << clipboardBrowserId), toByteArray("")))' returned FALSE. - # FAIL! : Tests::commandShowAt() 'NO_ERRORS(m_test->waitOnOutput((Args() << "visible"), toByteArray("true\n")))' returned FALSE. - sed -Ei -e ' - /Tests::(actionDialog(Accept|Selection(|InputOutput))|commandShow)/,/}/ { - /^\s*\{/ a \ - #if QT_VERSION < QT_VERSION_CHECK(6,0,0)\ - SKIP("Broken on qt5");\ - #endif - }' src/tests/tests.cpp || die -} - -src_configure() { - local mycmakeargs=( - -DPLUGIN_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins" - -DWITH_NATIVE_NOTIFICATIONS=$(usex notification) - -DWITH_QT6=$(usex qt6) - -DWITH_TESTS=$(usex test) - ) - - cmake_src_configure -} - -my_src_test() { - # Don't rerun tests and more logs - local -x COPYQ_TESTS_RERUN_FAILED=0 - local -x COPYQ_LOG_LEVEL=DEBUG - - # Skip test that require network - local -x COPYQ_TESTS_NO_NETWORK=1 - - # Less noise from trying the wayland plugin - local -x QT_QPA_PLATFORM=xcb - - # Make sure copyq doesn't use system installed plugins which may be incompatible. - local -x COPYQ_PLUGIN_DIR="${BUILD_DIR}/plugins" - - # In case the users current system confuses the notification integration - unset KDE_FULL_SESSION XDG_CURRENT_DESKTOP - - mkdir "${HOME}"/.gnupg || die - - ebegin "Starting Openbox" - openbox & # upstream uses Openbox and it doesn't fail like IceWM - sleep 5 - eend 0 - - "${BUILD_DIR}"/copyq tests - - return $? -} - -src_test() { - virtx my_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "encryption support" app-crypt/gnupg -} diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch deleted file mode 100644 index b06e7e759b84..000000000000 --- a/x11-misc/copyq/files/copyq-7.1.0-fix-gpg-2.1-support.patch +++ /dev/null @@ -1,558 +0,0 @@ -https://github.com/hluk/CopyQ/pull/2471 -https://github.com/hluk/CopyQ/issues/2463 -https://github.com/hluk/CopyQ/commit/a7a891e1f84c6c046a7bfc904c5fc6ebb98dec94 - -From a7a891e1f84c6c046a7bfc904c5fc6ebb98dec94 Mon Sep 17 00:00:00 2001 -From: Lukas Holecek <hluk@email.cz> -Date: Wed, 20 Sep 2023 19:42:08 +0200 -Subject: [PATCH] itemencrypted: Fix managing keys with gpg 2.1 and above - (#2471) - -* itemencrypted: Fix managing keys with gpg 2.1 and above - -Fixes #2463, #1208 - -* Tests: Avoid skipping itemencrypted tests if gpg is not found - -* Windows: Fix running itemencrypted plugin tests - -* itemencrypted: Fix error logging - -* Ensure config directory exists - -* itemencrypted: Fix handling native/non-native key paths - -* Appveyor: Fix stuck job waiting on gpg-agent ---- a/plugins/itemencrypted/itemencrypted.cpp -+++ b/plugins/itemencrypted/itemencrypted.cpp -@@ -57,20 +57,23 @@ bool waitOrTerminate(QProcess *p, int timeoutMs) - bool verifyProcess(QProcess *p, int timeoutMs = 30000) - { - if ( !waitOrTerminate(p, timeoutMs) ) { -- log( "ItemEncrypt ERROR: Process timed out; stderr: " + p->readAllStandardError(), LogError ); -+ log( QStringLiteral("ItemEncrypt: Process timed out; stderr: %1") -+ .arg(QString::fromUtf8(p->readAllStandardError())), LogError ); - return false; - } - - const int exitCode = p->exitCode(); - if ( p->exitStatus() != QProcess::NormalExit ) { -- log( "ItemEncrypt ERROR: Failed to run GnuPG: " + p->errorString(), LogError ); -+ log( QStringLiteral("ItemEncrypt: Failed to run GnuPG: %1") -+ .arg(p->errorString()), LogError ); - return false; - } - - if (exitCode != 0) { - const QString errors = p->readAllStandardError(); - if ( !errors.isEmpty() ) -- log( "ItemEncrypt ERROR: GnuPG stderr:\n" + errors, LogError ); -+ log( QStringLiteral("ItemEncrypt: GnuPG stderr:\n%1") -+ .arg(errors), LogError ); - return false; - } - -@@ -88,55 +91,106 @@ QString getGpgVersionOutput(const QString &executable) { - return p.readAllStandardOutput(); - } - --bool checkGpgExecutable(const QString &executable) -+struct GpgVersion { -+ int major; -+ int minor; -+}; -+ -+GpgVersion parseVersion(const QString &versionOutput) - { -- const auto versionOutput = getGpgVersionOutput(executable); -- return versionOutput.contains(" 2."); -+ const int lineEndIndex = versionOutput.indexOf('\n'); -+#if QT_VERSION < QT_VERSION_CHECK(5,15,2) -+ const QStringRef firstLine = versionOutput.midRef(0, lineEndIndex); -+#else -+ const auto firstLine = QStringView{versionOutput}.mid(0, lineEndIndex); -+#endif -+ const QRegularExpression versionRegex(QStringLiteral(R"( (\d+)\.(\d+))")); -+ const QRegularExpressionMatch match = versionRegex.match(firstLine); -+#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) -+ const int major = match.hasMatch() ? match.capturedView(1).toInt() : 0; -+ const int minor = match.hasMatch() ? match.capturedView(2).toInt() : 0; -+#else -+ const int major = match.hasMatch() ? match.capturedRef(1).toInt() : 0; -+ const int minor = match.hasMatch() ? match.capturedRef(2).toInt() : 0; -+#endif -+ return GpgVersion{major, minor}; - } - -+class GpgExecutable { -+public: -+ GpgExecutable() = default; -+ -+ explicit GpgExecutable(const QString &executable) -+ : m_executable(executable) -+ { -+ const auto versionOutput = getGpgVersionOutput(executable); -+ if ( !versionOutput.isEmpty() ) { -+ COPYQ_LOG_VERBOSE( -+ QStringLiteral("ItemEncrypt INFO: '%1 --version' output: %2") -+ .arg(executable, versionOutput) ); -+ -+ const GpgVersion version = parseVersion(versionOutput); -+ m_isSupported = version.major >= 2; -+ COPYQ_LOG( QStringLiteral("ItemEncrypt INFO: %1 gpg version: %2.%3") -+ .arg(m_isSupported ? "Supported" : "Unsupported") -+ .arg(version.major) -+ .arg(version.minor) ); -+ -+ const bool needsSecring = version.major == 2 && version.minor == 0; -+ -+ const QString path = getConfigurationFilePath(""); -+ m_pubring = path + ".pub"; -+ m_pubringNative = QDir::toNativeSeparators(m_pubring); -+ if (needsSecring) { -+ m_secring = path + ".sec"; -+ m_secringNative = QDir::toNativeSeparators(m_secring); -+ } -+ - #ifdef Q_OS_WIN --bool checkUnixGpg(const QString &executable) --{ -- static const auto unixGpg = getGpgVersionOutput(executable).contains("Home: /c/"); -- return unixGpg; --} -+ const bool isUnixGpg = versionOutput.contains("Home: /c/"); -+ if (isUnixGpg) { -+ m_pubringNative = QString(m_pubring).replace(":", "").insert(0, '/'); -+ if (needsSecring) -+ m_secringNative = QString(m_secring).replace(":", "").insert(0, '/'); -+ } - #endif -+ } -+ } -+ -+ const QString &executable() const { return m_executable; } -+ bool isSupported() const { return m_isSupported; } -+ bool needsSecring() const { return !m_secring.isEmpty(); } -+ const QString &pubring() const { return m_pubring; } -+ const QString &secring() const { return m_secring; } -+ const QString &pubringNative() const { return m_pubringNative; } -+ const QString &secringNative() const { return m_secringNative; } -+ -+private: -+ QString m_executable; -+ QString m_pubring; -+ QString m_secring; -+ QString m_pubringNative; -+ QString m_secringNative; -+ bool m_isSupported = false; -+}; - --QString findGpgExecutable() -+GpgExecutable findGpgExecutable() - { - for (const auto &executable : {"gpg2", "gpg"}) { -- if ( checkGpgExecutable(executable) ) -- return executable; -+ GpgExecutable gpg(executable); -+ if ( gpg.isSupported() ) -+ return gpg; - } - -- return QString(); -+ return GpgExecutable(); - } - --const QString &gpgExecutable() -+const GpgExecutable &gpgExecutable() - { - static const auto gpg = findGpgExecutable(); - return gpg; - } - --struct KeyPairPaths { -- KeyPairPaths() -- { -- const QString path = getConfigurationFilePath(""); -- sec = QDir::toNativeSeparators(path + ".sec"); -- pub = QDir::toNativeSeparators(path + ".pub"); -- --#ifdef Q_OS_WIN -- if (checkUnixGpg(gpgExecutable())) { -- pub = QDir::fromNativeSeparators(pub).replace(":", "").insert(0, '/'); -- sec = QDir::fromNativeSeparators(sec).replace(":", "").insert(0, '/'); -- } --#endif -- } -- -- QString sec; -- QString pub; --}; -- - QStringList getDefaultEncryptCommandArguments(const QString &publicKeyPath) - { - return QStringList() << "--trust-model" << "always" << "--recipient" << "copyq" -@@ -146,16 +200,18 @@ QStringList getDefaultEncryptCommandArguments(const QString &publicKeyPath) - - void startGpgProcess(QProcess *p, const QStringList &args, QIODevice::OpenModeFlag mode) - { -- KeyPairPaths keys; -- p->start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) + args, mode); -+ const auto &gpg = gpgExecutable(); -+ p->start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) + args, mode); - } - - QString importGpgKey() - { -- KeyPairPaths keys; -+ const auto &gpg = gpgExecutable(); -+ if ( !gpg.needsSecring() ) -+ return QString(); - - QProcess p; -- p.start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) << "--import" << keys.sec); -+ p.start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) << "--import" << gpg.secringNative()); - if ( !verifyProcess(&p) ) - return "Failed to import private key (see log)."; - -@@ -164,18 +220,20 @@ QString importGpgKey() - - QString exportGpgKey() - { -- KeyPairPaths keys; -+ const auto &gpg = gpgExecutable(); -+ if ( !gpg.needsSecring() ) -+ return QString(); - - // Private key already created or exported. -- if ( QFile::exists(keys.sec) ) -+ if ( QFile::exists(gpg.secring()) ) - return QString(); - - QProcess p; -- p.start(gpgExecutable(), getDefaultEncryptCommandArguments(keys.pub) << "--export-secret-key" << "copyq"); -+ p.start(gpg.executable(), getDefaultEncryptCommandArguments(gpg.pubringNative()) << "--export-secret-key" << gpg.secringNative()); - if ( !verifyProcess(&p) ) - return "Failed to export private key (see log)."; - -- QFile secKey(keys.sec); -+ QFile secKey(gpg.secring()); - if ( !secKey.open(QIODevice::WriteOnly) ) - return "Failed to create private key."; - -@@ -240,7 +298,7 @@ bool encryptMimeData(const QVariantMap &data, const QModelIndex &index, QAbstrac - - void startGenerateKeysProcess(QProcess *process, bool useTransientPasswordlessKey = false) - { -- const KeyPairPaths keys; -+ const auto &gpg = gpgExecutable(); - - auto args = QStringList() << "--batch" << "--gen-key"; - -@@ -253,15 +311,19 @@ void startGenerateKeysProcess(QProcess *process, bool useTransientPasswordlessKe - } - - startGpgProcess(process, args, QIODevice::ReadWrite); -- process->write( "\nKey-Type: RSA" -- "\nKey-Usage: encrypt" -- "\nKey-Length: 4096" -- "\nName-Real: copyq" -- + transientOptions + -- "\n%secring " + keys.sec.toUtf8() + -- "\n%pubring " + keys.pub.toUtf8() + -- "\n%commit" -- "\n" ); -+ process->write( -+ "\nKey-Type: RSA" -+ "\nKey-Usage: encrypt" -+ "\nKey-Length: 4096" -+ "\nName-Real: copyq" -+ + transientOptions + -+ "\n%pubring " + gpg.pubringNative().toUtf8() -+ ); -+ -+ if ( gpg.needsSecring() ) -+ process->write("\n%secring " + gpg.secringNative().toUtf8()); -+ -+ process->write("\n%commit\n"); - process->closeWriteChannel(); - } - -@@ -276,7 +338,7 @@ QString exportImportGpgKeys() - - bool isGpgInstalled() - { -- return !gpgExecutable().isEmpty(); -+ return gpgExecutable().isSupported(); - } - - } // namespace -@@ -314,7 +376,7 @@ bool ItemEncryptedSaver::saveItems(const QString &, const QAbstractItemModel &mo - bytes = readGpgOutput(QStringList("--encrypt"), bytes); - if ( bytes.isEmpty() ) { - emitEncryptFailed(); -- COPYQ_LOG("ItemEncrypt ERROR: Failed to read encrypted data"); -+ log("ItemEncrypt: Failed to read encrypted data", LogError); - return false; - } - -@@ -325,7 +387,7 @@ bool ItemEncryptedSaver::saveItems(const QString &, const QAbstractItemModel &mo - - if ( stream.status() != QDataStream::Ok ) { - emitEncryptFailed(); -- COPYQ_LOG("ItemEncrypt ERROR: Failed to write encrypted data"); -+ log("ItemEncrypt: Failed to write encrypted data", LogError); - return false; - } - -@@ -510,17 +572,22 @@ void ItemEncryptedScriptable::pasteEncryptedItems() - - QString ItemEncryptedScriptable::generateTestKeys() - { -- const KeyPairPaths keys; -- for ( const auto &keyFileName : {keys.sec, keys.pub} ) { -+ const auto &gpg = gpgExecutable(); -+ -+ const QStringList keys = gpg.needsSecring() -+ ? QStringList{gpg.pubring(), gpg.secring()} -+ : QStringList{gpg.pubring()}; -+ -+ for (const auto &keyFileName : keys) { - if ( QFile::exists(keyFileName) && !QFile::remove(keyFileName) ) -- return QString("Failed to remove \"%1\"").arg(keys.sec); -+ return QString("Failed to remove \"%1\"").arg(keyFileName); - } - - QProcess process; - startGenerateKeysProcess(&process, true); - - if ( !verifyProcess(&process) ) { -- return QString("ItemEncrypt ERROR: %1; stderr: %2") -+ return QString("ItemEncrypt: %1; stderr: %2") - .arg( process.errorString(), - QString::fromUtf8(process.readAllStandardError()) ); - } -@@ -529,9 +596,9 @@ QString ItemEncryptedScriptable::generateTestKeys() - if ( !error.isEmpty() ) - return error; - -- for ( const auto &keyFileName : {keys.sec, keys.pub} ) { -+ for (const auto &keyFileName : keys) { - if ( !QFile::exists(keyFileName) ) -- return QString("Failed to create \"%1\"").arg(keys.sec); -+ return QString("Failed to create \"%1\"").arg(keyFileName); - } - - return QString(); -@@ -606,19 +673,29 @@ QWidget *ItemEncryptedLoader::createSettingsWidget(QWidget *parent) - m_encryptTabs.join('\n') ); - - if (status() != GpgNotInstalled) { -- KeyPairPaths keys; -+ const auto &gpg = gpgExecutable(); - ui->labelShareInfo->setTextFormat(Qt::RichText); -- ui->labelShareInfo->setText( ItemEncryptedLoader::tr( -- "To share encrypted items on other computer or" -- " session, you'll need public and secret key files:" -- "<ul>" -- "<li>%1</li>" -- "<li>%2<br />(Keep this secret key in a safe place.)</li>" -- "</ul>" -- ) -- .arg( quoteString(keys.pub), -- quoteString(keys.sec) ) -- ); -+ QString text = ItemEncryptedLoader::tr( -+ "To share encrypted items on other computer or" -+ " session, you'll need these secret key files (keep them in a safe place):" -+ ); -+ if (gpg.needsSecring()) { -+ text.append( QStringLiteral( -+ "<ul>" -+ "<li>%1</li>" -+ "<li>%2</li>" -+ "</ul>" -+ ).arg(quoteString(gpg.pubringNative()), quoteString(gpg.secringNative())) -+ ); -+ } else { -+ text.append( QStringLiteral( -+ "<ul>" -+ "<li>%1</li>" -+ "</ul>" -+ ).arg(quoteString(gpg.pubringNative())) -+ ); -+ } -+ ui->labelShareInfo->setText(text); - } - - updateUi(); -@@ -689,7 +766,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel - const int bytesRead = stream.readRawData(encryptedBytes, 4096); - if (bytesRead == -1) { - emitDecryptFailed(); -- COPYQ_LOG("ItemEncrypted ERROR: Failed to read encrypted data"); -+ log("ItemEncrypted: Failed to read encrypted data", LogError); - return nullptr; - } - p.write(encryptedBytes, bytesRead); -@@ -708,7 +785,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel - const QByteArray bytes = p.readAllStandardOutput(); - if ( bytes.isEmpty() ) { - emitDecryptFailed(); -- COPYQ_LOG("ItemEncrypt ERROR: Failed to read encrypted data."); -+ log("ItemEncrypt: Failed to read encrypted data", LogError); - verifyProcess(&p); - return nullptr; - } -@@ -719,7 +796,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel - stream2 >> length; - if ( stream2.status() != QDataStream::Ok ) { - emitDecryptFailed(); -- COPYQ_LOG("ItemEncrypt ERROR: Failed to parse item count!"); -+ log("ItemEncrypt: Failed to parse item count", LogError); - return nullptr; - } - length = qMin(length, static_cast<quint64>(maxItems)) - static_cast<quint64>(model->rowCount()); -@@ -728,7 +805,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel - for ( int i = 0; i < count && stream2.status() == QDataStream::Ok; ++i ) { - if ( !model->insertRow(i) ) { - emitDecryptFailed(); -- COPYQ_LOG("ItemEncrypt ERROR: Failed to insert item!"); -+ log("ItemEncrypt: Failed to insert item", LogError); - return nullptr; - } - QVariantMap dataMap; -@@ -738,7 +815,7 @@ ItemSaverPtr ItemEncryptedLoader::loadItems(const QString &, QAbstractItemModel - - if ( stream2.status() != QDataStream::Ok ) { - emitDecryptFailed(); -- COPYQ_LOG("ItemEncrypt ERROR: Failed to decrypt item!"); -+ log("ItemEncrypt: Failed to decrypt item", LogError); - return nullptr; - } - ---- a/plugins/itemencrypted/tests/itemencryptedtests.cpp -+++ b/plugins/itemencrypted/tests/itemencryptedtests.cpp -@@ -25,6 +25,8 @@ void ItemEncryptedTests::cleanupTestCase() - void ItemEncryptedTests::init() - { - TEST(m_test->init()); -+ -+ QVERIFY(isGpgInstalled()); - } - - void ItemEncryptedTests::cleanup() -@@ -34,13 +36,10 @@ void ItemEncryptedTests::cleanup() - - void ItemEncryptedTests::encryptDecryptData() - { -- if ( !isGpgInstalled() ) -- SKIP("gpg2 is required to run the test"); -- -- RUN("-e" << "plugins.itemencrypted.generateTestKeys()", "\n"); -+ RUN("plugins.itemencrypted.generateTestKeys()", "\n"); - - // Test gpg errors first. -- RUN("-e" << "plugins.itemencrypted.encrypt(input());print('')", ""); -+ RUN("plugins.itemencrypted.encrypt(input());print('')", ""); - - const QByteArray input("\x00\x01\x02\x03\x04", 5); - QByteArray stdoutActual; -@@ -60,10 +59,7 @@ void ItemEncryptedTests::encryptDecryptItems() - SKIP("Ctrl+L shortcut doesn't seem work on OS X"); - #endif - -- if ( !isGpgInstalled() ) -- SKIP("gpg2 is required to run the test"); -- -- RUN("-e" << "plugins.itemencrypted.generateTestKeys()", "\n"); -+ RUN("plugins.itemencrypted.generateTestKeys()", "\n"); - - // Load commands from the plugin generating keys. - RUN("keys" << "Ctrl+P" << "ENTER", ""); ---- a/src/app/clipboardserver.cpp -+++ b/src/app/clipboardserver.cpp -@@ -124,6 +124,8 @@ ClipboardServer::ClipboardServer(QApplication *app, const QString &sessionName) - - QApplication::setQuitOnLastWindowClosed(false); - -+ ensureSettingsDirectoryExists(); -+ - m_sharedData = std::make_shared<ClipboardBrowserShared>(); - m_sharedData->itemFactory = new ItemFactory(this); - m_sharedData->notifications = new NotificationDaemon(this); ---- a/src/common/config.cpp -+++ b/src/common/config.cpp -@@ -157,6 +157,20 @@ QString getConfigurationFilePathHelper() - - } // namespace - -+bool ensureSettingsDirectoryExists() -+{ -+ QDir settingsDir( settingsDirectoryPath() ); -+ if ( !settingsDir.mkpath(".") ) { -+ log( QStringLiteral("Failed to create the directory for settings: %1") -+ .arg(settingsDir.path()), -+ LogError ); -+ -+ return false; -+ } -+ -+ return true; -+} -+ - const QString &getConfigurationFilePath() - { - static const QString path = getConfigurationFilePathHelper(); ---- a/src/common/config.h -+++ b/src/common/config.h -@@ -9,6 +9,8 @@ class QString; - class QVariant; - class QWidget; - -+bool ensureSettingsDirectoryExists(); -+ - const QString &getConfigurationFilePath(); - - QString getConfigurationFilePath(const char *suffix); ---- a/src/item/itemstore.cpp -+++ b/src/item/itemstore.cpp -@@ -22,20 +22,6 @@ QString itemFileName(const QString &id) - return getConfigurationFilePath("_tab_") + part + QLatin1String(".dat"); - } - --bool createItemDirectory() --{ -- QDir settingsDir( settingsDirectoryPath() ); -- if ( !settingsDir.mkpath(".") ) { -- log( QString("Cannot create directory for settings %1!") -- .arg(quoteString(settingsDir.path()) ), -- LogError ); -- -- return false; -- } -- -- return true; --} -- - void printItemFileError( - const QString &action, const QString &id, const QFileDevice &file) - { -@@ -83,9 +69,6 @@ ItemSaverPtr createTab( - - ItemSaverPtr loadItems(const QString &tabName, QAbstractItemModel &model, ItemFactory *itemFactory, int maxItems) - { -- if ( !createItemDirectory() ) -- return nullptr; -- - const QString tabFileName = itemFileName(tabName); - if ( !QFile::exists(tabFileName) ) - return createTab(tabName, model, itemFactory, maxItems); -@@ -107,7 +90,7 @@ bool saveItems(const QString &tabName, const QAbstractItemModel &model, const It - { - const QString tabFileName = itemFileName(tabName); - -- if ( !createItemDirectory() ) -+ if ( !ensureSettingsDirectoryExists() ) - return false; - - // Save tab data to a new temporary file. diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch deleted file mode 100644 index 2b149ab843bf..000000000000 --- a/x11-misc/copyq/files/copyq-7.1.0-fix-qt-6.6.0-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://bugs.gentoo.org/916129 -https://github.com/hluk/CopyQ/pull/2508 -https://github.com/hluk/CopyQ/commit/19e9dd1c2ecb49b14a24159c5ac3bc1b77fdf250 - -From 19e9dd1c2ecb49b14a24159c5ac3bc1b77fdf250 Mon Sep 17 00:00:00 2001 -From: Nick Cao <nickcao@nichi.co> -Date: Tue, 17 Oct 2023 02:08:51 -0400 -Subject: [PATCH] itemfakevim: fix build with qt 6.6.0 (#2508) - -Reference: https://github.com/qt-creator/qt-creator/commit/e56e3b6f374e00179eb0537198437864dddc47f2 ---- a/plugins/itemfakevim/fakevim/fakevimhandler.cpp -+++ b/plugins/itemfakevim/fakevim/fakevimhandler.cpp -@@ -1057,14 +1057,6 @@ inline QString msgMarkNotSet(const QString &text) - return Tr::tr("Mark \"%1\" not set.").arg(text); - } - --static void initSingleShotTimer(QTimer *timer, int interval, FakeVimHandler::Private *receiver, -- void (FakeVimHandler::Private::*slot)()) --{ -- timer->setSingleShot(true); -- timer->setInterval(interval); -- QObject::connect(timer, &QTimer::timeout, receiver, slot); --} -- - class Input - { - public: -@@ -2424,6 +2416,16 @@ class FakeVimHandler::Private : public QObject - FakeVimSettings &s = *fakeVimSettings(); - }; - -+static void initSingleShotTimer(QTimer *timer, -+ int interval, -+ FakeVimHandler::Private *receiver, -+ void (FakeVimHandler::Private::*slot)()) -+{ -+ timer->setSingleShot(true); -+ timer->setInterval(interval); -+ QObject::connect(timer, &QTimer::timeout, receiver, slot); -+} -+ - FakeVimHandler::Private::GlobalData FakeVimHandler::Private::g; - - FakeVimHandler::Private::Private(FakeVimHandler *parent, QWidget *widget) diff --git a/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch b/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch deleted file mode 100644 index e526f3a89f0b..000000000000 --- a/x11-misc/copyq/files/copyq-7.1.0-fix-test-failure-due-to-invalid-regex.patch +++ /dev/null @@ -1,98 +0,0 @@ -https://github.com/hluk/CopyQ/commit/42c02f2dc74b188ea7982a30c38acaf668bbf76a - -From 42c02f2dc74b188ea7982a30c38acaf668bbf76a Mon Sep 17 00:00:00 2001 -From: Lukas Holecek <hluk@email.cz> -Date: Mon, 4 Sep 2023 21:12:44 +0200 -Subject: [PATCH] Avoid showing warnings about invalid regex - ---- a/src/scriptable/scriptableitemselection.cpp -+++ b/src/scriptable/scriptableitemselection.cpp -@@ -46,10 +46,6 @@ QVector<int> toIntVector(const QJSValue &value) - - QRegularExpression toRegularExpression(const QJSValue &value) - { -- // If argument is invalid/not-regexp, create an invalid regex to match nothing. -- if ( !value.isRegExp() ) -- return QRegularExpression("("); -- - const QVariant variant = value.toVariant(); - QRegularExpression regexp = variant.toRegularExpression(); - -@@ -136,7 +132,7 @@ QJSValue ScriptableItemSelection::selectAll() - - QJSValue ScriptableItemSelection::select(const QJSValue &re, const QString &mimeFormat) - { -- const QVariant regexp = re.isUndefined() ? QVariant() : toRegularExpression(re); -+ const QVariant regexp = re.isRegExp() ? toRegularExpression(re) : QVariant(); - m_proxy->selectionSelect(m_id, regexp, mimeFormat); - return m_self; - } ---- a/src/tests/testinterface.h -+++ b/src/tests/testinterface.h -@@ -85,9 +85,6 @@ class TestInterface { - /// Clean up tabs and items. Return error string on error. - virtual QByteArray cleanup() = 0; - -- /// Ignore given text in logs for current unit test. -- virtual void setIgnoreError(const QByteArray &ignoreError) = 0; -- - /// Platform specific key to remove (usually Delete, Backspace on OS X). - virtual QString shortcutToRemove() = 0; - ---- a/src/tests/tests.cpp -+++ b/src/tests/tests.cpp -@@ -150,8 +150,6 @@ bool testStderr(const QByteArray &stderrData, TestInterface::ReadStderrFlag flag - // Ignore exceptions and errors from clients in application log - // (these are expected in some tests). - static const std::vector<QRegularExpression> ignoreList{ -- plain("[EXPECTED-IN-TEST]"), -- - regex(R"(CopyQ Note \[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}\] <Client-[^\n]*)"), - - // X11 (Linux) -@@ -520,8 +518,6 @@ class TestInterfaceImpl final : public TestInterface { - if (m_server) { - QCoreApplication::processEvents(); - QByteArray output = readLogFile(maxReadLogSize); -- if ( !m_ignoreError.isEmpty() ) -- output.replace(m_ignoreError, "[EXPECTED-IN-TEST] " + m_ignoreError); - if ( flag == ReadAllStderr || !testStderr(output, flag) ) - return decorateOutput("Server STDERR", output); - } -@@ -645,16 +641,10 @@ class TestInterfaceImpl final : public TestInterface { - - QByteArray cleanup() override - { -- m_ignoreError.clear(); - addFailedTest(); - return QByteArray(); - } - -- void setIgnoreError(const QByteArray &ignoreError) override -- { -- m_ignoreError = ignoreError; -- } -- - QString shortcutToRemove() override - { - return ::shortcutToRemove(); -@@ -771,8 +761,6 @@ class TestInterfaceImpl final : public TestInterface { - QStringList m_failed; - - PlatformClipboardPtr m_clipboard; -- -- QByteArray m_ignoreError; - }; - - QString keyNameFor(QKeySequence::StandardKey standardKey) -@@ -2272,9 +2260,8 @@ void Tests::classItemSelection() - RUN(args << "ItemSelection().select(undefined, mimeItemNotes).str()", outRows.arg("0,2")); - - // Match nothing if select() argument is not a regular expression. -- m_test->setIgnoreError("QtWarning: QString::contains: invalid QRegularExpression object"); -+ RUN(args << "add" << "", ""); - RUN(args << "ItemSelection().select('A').str()", outRows.arg("")); -- m_test->setIgnoreError(QByteArray()); - } - - void Tests::classItemSelectionGetCurrent() diff --git a/x11-misc/devilspie2/Manifest b/x11-misc/devilspie2/Manifest index f3a750b2b5a7..d73df6eea56a 100644 --- a/x11-misc/devilspie2/Manifest +++ b/x11-misc/devilspie2/Manifest @@ -1,2 +1 @@ -DIST devilspie2-0.44.tar.xz 46028 BLAKE2B e9ec3115781575c331d91e982fd1c71361ea57004a1b7ff234957998d3d44fd4e9a0ca1fde9d133e9e4c2d01b6e8d192921554eae8b83acfb0e3fa44b0c9fd23 SHA512 f01f2d044a670dd9b1b97e896a3e8ebcac3e67daea9f08a14bce26fe8084b85f7fdaa0ed147aba91626200f882eddeba7e0ec18f0f565cb7557ffb2ac74a4a64 DIST devilspie2_0.45-src.tar.gz 59202 BLAKE2B 8b8fc5c9a91f0e8c2ff8494c52f6c6e406babb86ed8985573b2509ed4d4741d81dff8bab6267508d727a2d73abd031d4d4d74e7ac1a05948e331b8712b1b390c SHA512 4dc9e8c81cf2b20e828509483243d23fbd296955050d3d4c4693754b62762d44022f4969a077bd7d75e6b0e0c89168c31c09b1dc345bf3275b444b9b6c9e0515 diff --git a/x11-misc/devilspie2/devilspie2-0.44.ebuild b/x11-misc/devilspie2/devilspie2-0.44.ebuild deleted file mode 100644 index 8f5a37e52d01..000000000000 --- a/x11-misc/devilspie2/devilspie2-0.44.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} luajit ) -inherit lua-single plocale toolchain-funcs - -DESCRIPTION="Window matching utility with Lua scripting" -HOMEPAGE="https://www.nongnu.org/devilspie2/" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -REQUIRED_USE="${LUA_REQUIRED_USE}" - -RDEPEND=" - ${LUA_DEPS} - dev-libs/glib:2 - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXinerama - x11-libs/libwnck:3" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig" - -src_compile() { - tc-export CC PKG_CONFIG - - local PLOCALES="fi fr it ja nl pt_BR ru sv" - - DEVILSPIE2_ARGS=( - PREFIX="${EPREFIX}"/usr - LANGUAGES="$(plocale_get_locales)" - LUA=${ELUA} - ) - - mkdir obj || die # race condition (bug #881473) - emake "${DEVILSPIE2_ARGS[@]}" -} - -src_install() { - emake DESTDIR="${D}" "${DEVILSPIE2_ARGS[@]}" install - einstalldocs - - dodoc -r doc/examples -} diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest index 5a6de40dc4fe..b59d210d6756 100644 --- a/x11-misc/dunst/Manifest +++ b/x11-misc/dunst/Manifest @@ -1 +1 @@ -DIST dunst-1.11.0.tar.gz 4645279 BLAKE2B 0daa8d098f032a0e3b16872bc2e33c8411e8eed543fc13533e649935d2d0796ad74b3fb27769f839972b335b7a2f7ae6b5efd9f324a8bb807ac2f82fa8611a5d SHA512 84c9edccddd183fb867233cb5377115d96735f4c1be84007194ac39dd48d913e5bb021d2952057aecdb978564c2471a8974c4ee4eeccfb188e5345527007a5c4 +DIST dunst-1.12.1.tar.gz 4654978 BLAKE2B 61dfb8c3e56367cb2afed925f4ee66891ae8edd68837d6391889972aff46683eb5fe8fbf5951e30d6be9074aa648be480847e46cc36c2db6bb4024b42c02064c SHA512 0b4ef72bde6bd4b535f11b58d8bf463df3b9b06d5e2ff40e327eb25f13771eb52c7f7aa91590c6d1228ecb3bc2105510409b6984dd45b5e747c1141f3b79b46c diff --git a/x11-misc/dunst/dunst-1.11.0.ebuild b/x11-misc/dunst/dunst-1.12.1.ebuild index c6201fa8537d..b00e2099db8d 100644 --- a/x11-misc/dunst/dunst-1.11.0.ebuild +++ b/x11-misc/dunst/dunst-1.12.1.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 @@ -12,22 +12,24 @@ SRC_URI="https://github.com/dunst-project/dunst/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="BSD" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86" -IUSE="wayland" +IUSE="+completions +dunstify wayland +X +xdg" DEPEND=" dev-libs/glib:2 sys-apps/dbus - x11-libs/cairo[X,glib] + x11-libs/cairo[X?,glib] x11-libs/gdk-pixbuf:2 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXScrnSaver - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libnotify - x11-libs/pango[X] - x11-misc/xdg-utils + x11-libs/pango[X?] + dunstify? ( x11-libs/libnotify ) wayland? ( dev-libs/wayland ) + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXScrnSaver + x11-libs/libXinerama + x11-libs/libXrandr + ) + xdg? ( x11-misc/xdg-utils ) " RDEPEND="${DEPEND}" @@ -38,6 +40,8 @@ BDEPEND=" wayland? ( dev-libs/wayland-protocols ) " +REQUIRED_USE="|| ( wayland X )" + src_prepare() { default @@ -57,9 +61,11 @@ src_configure() { src_compile() { local myemakeargs=( + DUNSTIFY="$(usex dunstify 1 0)" SYSCONFDIR="${EPREFIX}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" + X11="$(usex X 1 0)" ) emake "${myemakeargs[@]}" @@ -67,10 +73,13 @@ src_compile() { src_install() { local myemakeargs=( + COMPLETIONS="$(usex completions 1 0)" + DUNSTIFY="$(usex dunstify 1 0)" PREFIX="${ED}/usr" SYSCONFDIR="${ED}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" + X11="$(usex X 1 0)" ) emake "${myemakeargs[@]}" install diff --git a/x11-misc/dunst/dunst-9999.ebuild b/x11-misc/dunst/dunst-9999.ebuild index 901f3e6a33b9..38f2b2385cea 100644 --- a/x11-misc/dunst/dunst-9999.ebuild +++ b/x11-misc/dunst/dunst-9999.ebuild @@ -12,22 +12,24 @@ HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst" LICENSE="BSD" SLOT="0" -IUSE="wayland" +IUSE="+completions +dunstify wayland +X +xdg" DEPEND=" dev-libs/glib:2 sys-apps/dbus - x11-libs/cairo[X,glib] + x11-libs/cairo[X?,glib] x11-libs/gdk-pixbuf:2 - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXScrnSaver - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libnotify - x11-libs/pango[X] - x11-misc/xdg-utils + x11-libs/pango[X?] + dunstify? ( x11-libs/libnotify ) wayland? ( dev-libs/wayland ) + X? ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXScrnSaver + x11-libs/libXinerama + x11-libs/libXrandr + ) + xdg? ( x11-misc/xdg-utils ) " RDEPEND="${DEPEND}" @@ -38,14 +40,17 @@ BDEPEND=" wayland? ( dev-libs/wayland-protocols ) " +REQUIRED_USE="|| ( wayland X )" + src_prepare() { default # Respect users CFLAGS sed -e 's/-Os//' -i config.mk || die - # Use correct path for system unit + # Use correct path for dbus and system unit sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i dunst.systemd.service.in || die + sed -e "s|##PREFIX##|${EPREFIX}/usr|" -i org.knopwob.dunst.service.in || die } src_configure() { @@ -56,9 +61,11 @@ src_configure() { src_compile() { local myemakeargs=( + DUNSTIFY="$(usex dunstify 1 0)" SYSCONFDIR="${EPREFIX}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" + X11="$(usex X 1 0)" ) emake "${myemakeargs[@]}" @@ -66,10 +73,13 @@ src_compile() { src_install() { local myemakeargs=( + COMPLETIONS="$(usex completions 1 0)" + DUNSTIFY="$(usex dunstify 1 0)" PREFIX="${ED}/usr" SYSCONFDIR="${ED}/etc/xdg" SYSTEMD="0" WAYLAND="$(usex wayland 1 0)" + X11="$(usex X 1 0)" ) emake "${myemakeargs[@]}" install diff --git a/x11-misc/dunst/metadata.xml b/x11-misc/dunst/metadata.xml index 47e53e6187f7..856034fe4775 100644 --- a/x11-misc/dunst/metadata.xml +++ b/x11-misc/dunst/metadata.xml @@ -5,6 +5,11 @@ <email>conikost@gentoo.org</email> <name>Conrad Kostecki</name> </maintainer> + <use> + <flag name="completions">Install shell completions (for bash, fish and zsh)</flag> + <flag name="dunstify">Build dunstify (notify-send alternative)</flag> + <flag name="xdg">Install xdg-utils for opening links with xdg-open</flag> + </use> <upstream> <remote-id type="github">dunst-project/dunst</remote-id> </upstream> diff --git a/x11-misc/e16-keyedit/Manifest b/x11-misc/e16-keyedit/Manifest index 12e554442e11..dcb8b35c73f4 100644 --- a/x11-misc/e16-keyedit/Manifest +++ b/x11-misc/e16-keyedit/Manifest @@ -1 +1 @@ -DIST e16-keyedit-0.9.tar.xz 80588 BLAKE2B 2c8a1ac4ae0e2b3b741408637997e1054ca2d5121b6cc27622de0896d8dd30d65b92458592f2e8c3f02ddfbb2ab336631168dbe6840127533f0d9da3bf7973c1 SHA512 77e8db879a2a790c0e08d0527bd613f443fdc433bfb50a95d8201008702282c407c68f41f0d2457704b887b2cebede1326bb40aba18f717207443a9e41d87b9e +DIST e16-keyedit-0.10.tar.xz 83000 BLAKE2B ed518ab056a2fffa2c8be88f8b890a1e159edbebbf00fa28116a0802f2057e5386d7f775ed360ab2d9492596c7debd742d8f7206c845d9ab004b485eb050bc0c SHA512 e51ca690fb95c0f9bd8ecc214de33f27f8e083c8a4cfb7a975f544e929ded0dced439990fe99c7293f39616fe577d0693524649b37fa27c0240c79ccf3ec099b diff --git a/x11-misc/e16-keyedit/e16-keyedit-0.9-r1.ebuild b/x11-misc/e16-keyedit/e16-keyedit-0.10.ebuild index af2bd6118610..544543d2863e 100644 --- a/x11-misc/e16-keyedit/e16-keyedit-0.9-r1.ebuild +++ b/x11-misc/e16-keyedit/e16-keyedit-0.10.ebuild @@ -6,20 +6,14 @@ EAPI=8 DESCRIPTION="Key binding editor for Enlightenment DR16" HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/" SRC_URI="https://downloads.sourceforge.net/enlightenment/${P}.tar.xz" -KEYWORDS="~amd64 ~x86" LICENSE="MIT-with-advertising" SLOT="0" +KEYWORDS="~amd64 ~x86" -BDEPEND=" - virtual/pkgconfig -" -DEPEND=" - x11-libs/gtk+:3 -" -RDEPEND="${DEPEND} - !x11-misc/e16keyedit -" +BDEPEND="virtual/pkgconfig" +DEPEND="x11-libs/gtk+:3" +RDEPEND="${DEPEND}" src_configure() { econf --with-gtk=gtk3 diff --git a/x11-misc/fireflies/files/fireflies-2.08-header_case.patch b/x11-misc/fireflies/files/fireflies-2.08-header_case.patch new file mode 100644 index 000000000000..2a87c2d66534 --- /dev/null +++ b/x11-misc/fireflies/files/fireflies-2.08-header_case.patch @@ -0,0 +1,12 @@ +diff -Naur fireflies-2.08.orig/libgfx/src/gui.cxx fireflies-2.08/libgfx/src/gui.cxx +--- fireflies-2.08.orig/libgfx/src/gui.cxx 2015-10-15 23:55:12.000000000 +0200 ++++ fireflies-2.08/libgfx/src/gui.cxx 2025-01-04 00:22:31.207703177 +0100 +@@ -13,7 +13,7 @@ + #include <gfx/gui.h> + #include <gfx/raster.h> + +-#include <FL/fl_file_chooser.H> ++#include <FL/Fl_File_Chooser.H> + #include <FL/fl_ask.H> + + #include <cstdio> diff --git a/x11-misc/fireflies/fireflies-2.08-r1.ebuild b/x11-misc/fireflies/fireflies-2.08-r1.ebuild index 7858232ef416..7e27a9d7472e 100644 --- a/x11-misc/fireflies/fireflies-2.08-r1.ebuild +++ b/x11-misc/fireflies/fireflies-2.08-r1.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 @@ -22,6 +22,8 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="dev-build/autoconf-archive" # for AX_CXX_BOOL macro +PATCHES=( "${FILESDIR}"/${P}-header_case.patch ) + src_prepare() { default eautoreconf diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild index 6ef363fe516d..8d739a0fac51 100644 --- a/x11-misc/gccmakedep/gccmakedep-1.0.4.ebuild +++ b/x11-misc/gccmakedep/gccmakedep-1.0.4.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 DESCRIPTION="create dependencies in makefiles using 'gcc -M'" diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest index 1d05e1f5d05d..7a2838bc7fae 100644 --- a/x11-misc/gigolo/Manifest +++ b/x11-misc/gigolo/Manifest @@ -1 +1 @@ -DIST gigolo-0.5.3.tar.bz2 304664 BLAKE2B 958e2cdbd043adf1e4f166ca6435462ee2621d7f7bc4918505715bc3240f5ee2a60fb5a27f23a607a1ffd862d41123dfd5977aa87f7c4fe1c7a085d05aac3b2a SHA512 46d93d4c2654a91724208f144098f0a870465823a516339c8455345b5d32be6efe2b7fb13d3e5c89daf2cd919e07e5fcbdc8c8e93bce03c78dbe1907ea5edfcd +DIST gigolo-0.5.4.tar.bz2 507720 BLAKE2B 7fafd21dc25e3654ac3e0fa71a35ddabdba24dce1b41cfa8c3bfb26a5c32c08eba360b0f9fbbb5ef00d0206d402a3e0ed2adf1847f95059dc325915777b65fe4 SHA512 39802369b53f764394914ce40477ba51f8eb00089f2fb6ffe6eb590e797de0662ff84bbcac9fdfa532c54cb293f1482d4fa8a1282aa82991b6b36d2e8a5a3b0f diff --git a/x11-misc/gigolo/gigolo-0.5.3.ebuild b/x11-misc/gigolo/gigolo-0.5.4.ebuild index c9f487b1e13d..f6578f1c1fcc 100644 --- a/x11-misc/gigolo/gigolo-0.5.3.ebuild +++ b/x11-misc/gigolo/gigolo-0.5.4.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 @@ -7,7 +7,6 @@ inherit xdg-utils DESCRIPTION="A frontend to easily manage connections to remote filesystems using GIO/GVfs" HOMEPAGE=" - https://www.uvena.de/gigolo/ https://docs.xfce.org/apps/gigolo/start https://gitlab.xfce.org/apps/gigolo/ " @@ -15,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" DEPEND=" >=dev-libs/glib-2.38.0 @@ -25,7 +24,7 @@ RDEPEND=" ${DEPEND} " BDEPEND=" - dev-util/intltool + >=sys-devel/gettext-0.19.8 virtual/pkgconfig " diff --git a/x11-misc/grsync/files/grsync-1.3.0-desktop.patch b/x11-misc/grsync/files/grsync-1.3.0-desktop.patch deleted file mode 100644 index 5cdc49194371..000000000000 --- a/x11-misc/grsync/files/grsync-1.3.0-desktop.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur grsync-1.3.0.orig/configure.in grsync-1.3.0/configure.in ---- grsync-1.3.0.orig/configure.in 2020-05-28 10:16:05.000000000 +0200 -+++ grsync-1.3.0/configure.in 2020-12-04 09:30:40.082105813 +0100 -@@ -30,7 +30,7 @@ - GTK_API_VERSION="2.0" - fi - pkg_modules="gtk+-$GTK_API_VERSION >= 2.16.0" --OTHER_DESKTOP_ENTRIES="Icon=grsync.png" -+OTHER_DESKTOP_ENTRIES="Icon=grsync" - MIMEINFO_XMLNS="xmlns='http://www.freedesktop.org/standards/shared-mime-info'" - MIME_OSSOCAT="" - -diff -Naur grsync-1.3.0.orig/grsync.desktop.in grsync-1.3.0/grsync.desktop.in ---- grsync-1.3.0.orig/grsync.desktop.in 2015-09-11 13:21:28.000000000 +0200 -+++ grsync-1.3.0/grsync.desktop.in 2020-12-04 09:30:50.473110946 +0100 -@@ -4,7 +4,7 @@ - Terminal=false - Type=Application - MimeType=application/x-grsync-session; --Categories=Application;System; -+Categories=System; - GenericName=Synchronize files with rsync - GenericName[fr]=Interface GTK pour rsync - GenericName[it]=Sincronizza file con rsync diff --git a/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch b/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch deleted file mode 100644 index 6d135674bac8..000000000000 --- a/x11-misc/grsync/files/grsync-1.3.0-nested_func.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur grsync-1.3.0.orig/src/callbacks.c grsync-1.3.0/src/callbacks.c ---- grsync-1.3.0.orig/src/callbacks.c 2020-11-23 14:52:42.000000000 +0100 -+++ grsync-1.3.0/src/callbacks.c 2020-12-04 09:18:27.573776667 +0100 -@@ -40,12 +40,12 @@ - gboolean more = FALSE, first = TRUE; - - --void dialog_set_labels_selectable(GtkWidget *dialog) { -- void _set_label_selectable(gpointer data, gpointer user_data) { -- GtkWidget *widget = GTK_WIDGET(data); -- if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE); -- } -+void _set_label_selectable(gpointer data, gpointer user_data) { -+ GtkWidget *widget = GTK_WIDGET(data); -+ if (GTK_IS_LABEL(widget)) gtk_label_set_selectable(GTK_LABEL(widget), TRUE); -+} - -+void dialog_set_labels_selectable(GtkWidget *dialog) { - GtkWidget *area = gtk_message_dialog_get_message_area(GTK_MESSAGE_DIALOG(dialog)); - GtkContainer *box = (GtkContainer *) area; - GList *children = gtk_container_get_children(box); diff --git a/x11-misc/grub2-theme-preview/Manifest b/x11-misc/grub2-theme-preview/Manifest index c69bf1d0ace3..ab4b9bef021c 100644 --- a/x11-misc/grub2-theme-preview/Manifest +++ b/x11-misc/grub2-theme-preview/Manifest @@ -1,2 +1,3 @@ DIST grub2-theme-preview-2.8.0.tar.gz 203315 BLAKE2B 1599438dd24dec2e4ea82d3a6253c3b374afebdc1cac9ab666776b7e076b45111845ccfeb683a3ca851065459c8ce6a5fa5009cc2c809a4646048cdb25c38b96 SHA512 1df944957859f87fafd8cac445191e079d6e60d6513273dacc5a18e7959b1e57045fb6ebf6acb57407dc5ab5f7cc9278f8bfc6029b11c7f42721f1a8221c4a98 DIST grub2-theme-preview-2.9.0.tar.gz 204076 BLAKE2B 3371a15968f7b9ca383de75f47cf57e41bfa6bb0a0ea73ed7860f9ed2f256be0e2c902a58fca93ee75c7cc467acd4db89e6f212349243c287d2b05861e750d6e SHA512 d04e4a19f603e1595f5e21c7bfaa6af7f2a98fe0e877ed03b526994efcf853de8931700fd2450657b56f0bc48d56170d09e3c5cd5c222b4eaae89a09d8247c44 +DIST grub2-theme-preview-2.9.1.tar.gz 204082 BLAKE2B 12ad1af7d9e162f4a554095856105d7be3eea460b87f414959fecc254a814256400e53a5025f5133dce80a5c46492faf70ecad1002f9b4828a738a9fc89a2319 SHA512 2f2eedc209306695f3421511500d79ad4658b6ac9fef28213e2ae647680703dae2d41e548f88c06a1922654dd134b21d9da72e2a755a27177f8bb8dad1c15f00 diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild deleted file mode 100644 index 4af7e9df4faf..000000000000 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="8" - -PYTHON_COMPAT=( python3_{9..12} ) -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -DESCRIPTION="Preview a GRUB 2.x theme using KVM/QEMU" -HOMEPAGE="https://github.com/hartwork/grub2-theme-preview" -SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="grub_platforms_efi-64" - -RDEPEND="app-emulation/qemu - dev-libs/libisoburn - sys-fs/mtools - grub_platforms_efi-64? ( - sys-boot/grub:2[grub_platforms_efi-64] - || ( sys-firmware/edk2 sys-firmware/edk2-bin ) - ) - !grub_platforms_efi-64? ( - sys-boot/grub:2[grub_platforms_pc] - ) -" -DEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )" - -distutils_enable_tests pytest diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.9.1.ebuild index 32a64cd43390..7c6fc0deaa42 100644 --- a/x11-misc/grub2-theme-preview/grub2-theme-preview-2.8.0.ebuild +++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-2.9.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="8" -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..13} ) DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 @@ -15,17 +15,18 @@ SRC_URI="https://github.com/hartwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="grub_platforms_efi-64" +IUSE="grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_pc" +REQUIRED_USE="|| ( grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_pc )" RDEPEND="app-emulation/qemu dev-libs/libisoburn sys-fs/mtools - grub_platforms_efi-64? ( - sys-boot/grub:2[grub_platforms_efi-64] + sys-boot/grub:2[grub_platforms_efi-32?,grub_platforms_efi-64?,grub_platforms_pc?] + grub_platforms_efi-32? ( || ( sys-firmware/edk2 sys-firmware/edk2-bin ) ) - !grub_platforms_efi-64? ( - sys-boot/grub:2[grub_platforms_pc] + grub_platforms_efi-64? ( + || ( sys-firmware/edk2 sys-firmware/edk2-bin ) ) " DEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )" diff --git a/x11-misc/imake/imake-1.0.10.ebuild b/x11-misc/imake/imake-1.0.10.ebuild index 7d54508637cd..7db15ae359a3 100644 --- a/x11-misc/imake/imake-1.0.10.ebuild +++ b/x11-misc/imake/imake-1.0.10.ebuild @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -XORG_TARBALL_SUFFIX="xz" inherit toolchain-funcs xorg-3 DESCRIPTION="C preprocessor interface to the make utility" diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest index 80b9c168215f..8f3f56e91111 100644 --- a/x11-misc/j4-dmenu-desktop/Manifest +++ b/x11-misc/j4-dmenu-desktop/Manifest @@ -1,2 +1 @@ -DIST j4-dmenu-desktop-3.1.tar.gz 108974 BLAKE2B fd0527ee27855ef453b76e52cd15402bb86b9812255edacfacd5b5486162b052eb74d41f072fcf151837698d352dfa743a6bd30cd28156f62ddafc39d2402edb SHA512 6baa4bdf0564683e09bf3dd34f619ec9dcfc840be68ec0f68b4cd643bee5acbc09ebfffaf82daced991899fb467c84ed441257915a9c6b411f317e9947471fca DIST j4-dmenu-desktop-3.2.tar.gz 125056 BLAKE2B 7fd26fd749961feb2a0de73b888e085fc4275743335923ab4c8674e79aa85bb2fca4787069fc2cf40ddc0f1748df0ec7f77164ff1cca80cc3c648fff016584c7 SHA512 d6bffa372a461feb1b09293bf51eb8dc081cf1d7aef21f059c51b296dc52804c3cefd9ab6d64d9025bbdee325cb7d24f78719a8f9504f55b868f10ca9715ae5a diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild deleted file mode 100644 index a44226418300..000000000000 --- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PV="r${PV}" - -DESCRIPTION="A fast desktop replacement for i3-dmenu-desktop" -HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop" -SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${MY_PV}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+dmenu test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-cpp/catch:0 )" -DEPEND=" - dev-libs/libfmt:= - dev-libs/spdlog:= -" -RDEPEND=" - ${DEPEND} - dmenu? ( x11-misc/dmenu ) -" - -src_prepare() { - cmake_src_prepare - - # Respect users CFLAGS - sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DNO_DOWNLOAD="ON" - -DWITH_GIT_CATCH="no" - -DWITH_TESTS="$(usex test)" - ) - - cmake_src_configure -} - -src_install() { - cmake_src_install - - doman j4-dmenu-desktop.1 -} - -pkg_postinst() { - if ! use dmenu; then - elog "As you have disabled the 'dmenu' use flag," - elog "x11-misc/dmenu won't be installed by default." - elog "" - elog "Since x11-misc/j4-dmenu-desktop uses x11-misc/dmenu as default," - elog "you must configure your own replacement with --dmenu=<command>," - elog "as otherwise it won't work." - fi -} diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.2.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.2.ebuild index e56bc1b3ab29..88673cd9d27c 100644 --- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.2.ebuild +++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-3.2.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 @@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+dmenu test" RESTRICT="!test? ( test )" diff --git a/x11-misc/lightdm-gtk-greeter/metadata.xml b/x11-misc/lightdm-gtk-greeter/metadata.xml index 7256cab2c8b0..6490cc9f26a7 100644 --- a/x11-misc/lightdm-gtk-greeter/metadata.xml +++ b/x11-misc/lightdm-gtk-greeter/metadata.xml @@ -1,13 +1,17 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>immoloism@gmail.com</email> + <name>Ian Jordan</name> + </maintainer> <maintainer type="person"> <email>ceamac@gentoo.org</email> <name>Viorel Munteanu</name> </maintainer> - <maintainer type="person" proxied="yes"> - <email>immoloism@gmail.com</email> - <name>Ian Jordan</name> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <upstream> <remote-id type="github">Xubuntu/lightdm-gtk-greeter</remote-id> diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml index 769c044ad0d4..d5c231fcc9ad 100644 --- a/x11-misc/lightdm/metadata.xml +++ b/x11-misc/lightdm/metadata.xml @@ -1,13 +1,17 @@ <?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>immoloism@gmail.com</email> + <name>Ian Jordan</name> + </maintainer> <maintainer type="person"> <email>ceamac@gentoo.org</email> <name>Viorel Munteanu</name> </maintainer> - <maintainer type="person" proxied="yes"> - <email>immoloism@gmail.com</email> - <name>Ian Jordan</name> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <use> <flag name="gtk">Pull in the gtk+ greeter</flag> diff --git a/x11-misc/lndir/lndir-1.0.5.ebuild b/x11-misc/lndir/lndir-1.0.5.ebuild index 784bc50925af..4d60b0008fc7 100644 --- a/x11-misc/lndir/lndir-1.0.5.ebuild +++ b/x11-misc/lndir/lndir-1.0.5.ebuild @@ -3,7 +3,6 @@ EAPI=8 -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="create a shadow directory of symbolic links to another directory tree" diff --git a/x11-misc/makedepend/makedepend-1.0.9.ebuild b/x11-misc/makedepend/makedepend-1.0.9.ebuild index 964073a1af4e..1611a60eca9a 100644 --- a/x11-misc/makedepend/makedepend-1.0.9.ebuild +++ b/x11-misc/makedepend/makedepend-1.0.9.ebuild @@ -3,7 +3,6 @@ EAPI=8 -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="create dependencies in makefiles" diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest index c0c11eee7bd6..614bd99ce68c 100644 --- a/x11-misc/obconf-qt/Manifest +++ b/x11-misc/obconf-qt/Manifest @@ -1,2 +1 @@ -DIST obconf-qt-0.16.4.tar.xz 118780 BLAKE2B 5f8ffc2eddbd2c9fc7c019716256c5ae27c7d5ed3ffa1d221ca876d323f4833845908f2180895985ad94fcfe1596e773a3dfbdd7076350e7bc7bc00766040587 SHA512 4f75a5275e14cd7e8f0abc1bfcd40b4d860d613bc37c06c0e68d6f622ed126dce2fea98b5dd8e629b5de472ab5e668a5b0af7f6621d09fcb0b2287a11b0fb662 DIST obconf-qt-0.16.5.tar.xz 122908 BLAKE2B 9e696027504376bdc05776c2925da9b91222efce260d9a11e965b0b2bd028ffa75413413f7f1e82ce8bb63a159a585e293b854923a37d178c7c7d8ca74ceecd1 SHA512 50f3ac70ad3e31239eedfc498fac0bbc14371c13f270a52b2a90295655fa17024d2f081f56e1b9e5ca4f172835348a4813691f19ff41ab81648a7a74a2f19398 diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.4.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.4.ebuild deleted file mode 100644 index 582c6577d826..000000000000 --- a/x11-misc/obconf-qt/obconf-qt-0.16.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg-utils - -DESCRIPTION="Qt GUI Openbox Configuration Tool" -HOMEPAGE="https://lxqt.github.io/" - -if [[ ${PV} = *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" -else - SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -fi - -LICENSE="GPL-2 GPL-2+" -SLOT="0" - -BDEPEND=" - dev-qt/linguist-tools:5 - >=dev-util/lxqt-build-tools-0.8.0 - virtual/pkgconfig -" -RDEPEND=" - dev-libs/glib:2 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-wm/openbox:3 -" -DEPEND="${RDEPEND}" - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/x11-misc/obconf-qt/obconf-qt-0.16.5.ebuild b/x11-misc/obconf-qt/obconf-qt-0.16.5.ebuild index a686b156b2a0..b2183076bdce 100644 --- a/x11-misc/obconf-qt/obconf-qt-0.16.5.ebuild +++ b/x11-misc/obconf-qt/obconf-qt-0.16.5.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 @@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64" + KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2 GPL-2+" diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-2.1.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-2.1.0.ebuild index faa63a3caa12..55e7802633ae 100644 --- a/x11-misc/pcmanfm-qt/pcmanfm-qt-2.1.0.ebuild +++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-2.1.0.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 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2 GPL-2+ LGPL-2.1+" diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest index 3701a0dc928f..cd433c632a24 100644 --- a/x11-misc/polybar/Manifest +++ b/x11-misc/polybar/Manifest @@ -1,2 +1 @@ -DIST polybar-3.7.1.tar.gz 495162 BLAKE2B 33ffb3bb3595a41cb82a5ee70c79f5a31f23b6463c156a704546c803f0f006780c59b04fe2d1479f52dd15a44534687f130dfde794ac08218df2b634b34838de SHA512 cb248fd904a89dbd88d2d1ab71aeaf31e2b5781304f126aeb489da1238681e354d5347555076e814751ef5bb6717a3a6742d1726cf4721697e75694c7643bed4 DIST polybar-3.7.2.tar.gz 494383 BLAKE2B dda97c42de5f32a005ae6d4de737651278df0364187c735d7fa8a6d34e644b917ba3f32859cc19bd869c43f5d14f73ca734a4227651eb267724d808e4a766e08 SHA512 a0ee701533e101789f7eb95c71717ecf1d389a10b202d19261f9f71fee9d43fb8be17fb63e4a056c5e8bd62d2e669c95ee4d4b8c6bb06b933e1e4b26ab1a0624 diff --git a/x11-misc/polybar/polybar-3.7.1-r1.ebuild b/x11-misc/polybar/polybar-3.7.1-r1.ebuild deleted file mode 100644 index acdb2155246d..000000000000 --- a/x11-misc/polybar/polybar-3.7.1-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake optfeature python-single-r1 - -DESCRIPTION="A fast and easy-to-use tool for creating status bars" -HOMEPAGE="https://github.com/polybar/polybar" -SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep 'x11-base/xcb-proto[${PYTHON_USEDEP}]') - dev-libs/libuv:= - media-libs/fontconfig - media-libs/freetype - x11-base/xorg-proto - x11-libs/cairo[X,xcb(+)] - x11-libs/libxcb:= - x11-libs/xcb-util - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-wm - x11-libs/xcb-util-xrm - alsa? ( media-libs/alsa-lib ) - curl? ( net-misc/curl ) - doc? ( dev-python/sphinx ) - i3wm? ( - dev-libs/jsoncpp:= - x11-wm/i3 - ) - mpd? ( media-libs/libmpdclient ) - network? ( dev-libs/libnl:3 ) - pulseaudio? ( media-libs/libpulse ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DENABLE_ALSA="$(usex alsa)" - -DENABLE_CURL="$(usex curl)" - -DBUILD_DOC="$(usex doc)" - -DENABLE_I3="$(usex i3wm)" - -DBUILD_POLYBAR_MSG="$(usex ipc)" - -DENABLE_MPD="$(usex mpd)" - -DENABLE_NETWORK="$(usex network)" - -DENABLE_PULSEAUDIO="$(usex pulseaudio)" - # Bug 767949 - -DENABLE_CCACHE="OFF" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc/" - ) - - cmake_src_configure -} - -pkg_postinst() { - optfeature "Unprivileged display backlight control via udev" sys-power/acpilight -} diff --git a/x11-misc/polybar/polybar-3.7.2.ebuild b/x11-misc/polybar/polybar-3.7.2.ebuild index 7dfd36994d4a..3e08e6ca1869 100644 --- a/x11-misc/polybar/polybar-3.7.2.ebuild +++ b/x11-misc/polybar/polybar-3.7.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake optfeature python-single-r1 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/polybar/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" +KEYWORDS="amd64 ~riscv x86" IUSE="alsa curl doc i3wm ipc mpd network pulseaudio" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/x11-misc/qarma/Manifest b/x11-misc/qarma/Manifest index 162db8e02e2c..25b52f9f2261 100644 --- a/x11-misc/qarma/Manifest +++ b/x11-misc/qarma/Manifest @@ -1 +1 @@ -DIST qarma-1.tar.gz 20688 BLAKE2B 6cee7ba418c2e71398690b46a7415c9a6708a04757f0cdc9e91c4f9a084fad8668264c3360eb48249b19b601540dbca09546730e09eb208daacb8e8b688cd17f SHA512 011275b73df25a49e9810cabead8811d4c09fe20272c71e6208fb49b12ca59321d51c8dfb4fb32735c9e93c8ce7742122eea40fc14228904abb1447ef4d0f600 +DIST qarma-1.0.0.tar.gz 28288 BLAKE2B 6e9bb0d81fb0ba85f2cd0d1fa3a509f95da87dfe88b1f3a4a4fa9031394820fae212557555b96033eaa7f8940aa6f15acae32dbd1dd7f46649bd398bd07b33f4 SHA512 64b81b4401752bc76a6b04ec5f87eed7910c355006e7c15cd2cc5a4bb770b0b39f6ddcaba451ec1164bd3ef160dc852e287185a560e82a4b1453549429b80ab1 diff --git a/x11-misc/qarma/qarma-1.ebuild b/x11-misc/qarma/qarma-1.0.0-r1.ebuild index 941c13cbebca..5a482f344b01 100644 --- a/x11-misc/qarma/qarma-1.ebuild +++ b/x11-misc/qarma/qarma-1.0.0-r1.ebuild @@ -1,30 +1,23 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit qmake-utils -DESCRIPTION="Zenity Clone for Qt5" +DESCRIPTION="Zenity Clone for Qt" HOMEPAGE="https://github.com/luebking/qarma" -SRC_URI="https://github.com/luebking/qarma/archive/t${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/luebking/qarma/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5" +DEPEND="dev-qt/qtbase:6[X,dbus,gui,widgets]" RDEPEND="${DEPEND}" -S="${WORKDIR}/${PN}-t${PV}" - src_configure() { - eqmake5 + eqmake6 } src_install() { diff --git a/x11-misc/qps/qps-2.10.0.ebuild b/x11-misc/qps/qps-2.10.0.ebuild index 9843e43654d8..3567a276174b 100644 --- a/x11-misc/qps/qps-2.10.0.ebuild +++ b/x11-misc/qps/qps-2.10.0.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 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2 GPL-2+ LGPL-2.1+ QPL-1.0" diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest index 16af51180b67..e21ebea64e20 100644 --- a/x11-misc/qt5ct/Manifest +++ b/x11-misc/qt5ct/Manifest @@ -1 +1,2 @@ DIST qt5ct-1.8.tar.bz2 85945 BLAKE2B 0a882a076eb1013c4196e9067f7ed135b0f86c2850071de4945bb17053618a605ca412fbc1c7a87a6e00ee051f4fb5f0d31754490aa51abe472c72a6918088c9 SHA512 5417850fb2bad4faaed59c8af61bec04c1ee7fefe8495286571e257b2f68cd417d36439c66fcfac28bb735c753a4ca4cec327b74e97e5ce8c2d4e36b3e4fba28 +DIST qt5ct-1.9.tar.bz2 87416 BLAKE2B 72aa7055c4f7ae901001c343e2c2ad8a21568e493277f9b4b3b94497aa7bce252c6c72426d86c4427cf7545c6bfcf650f1587ebfe40842fc848115d226ec817f SHA512 8f0ed517c6b6f42eb75ac20a629cae6230846f5bdcb0a5446f52f5dc46812ee0278d095433804cd3c25c650d1737eb02d2ab2bd88fea65efa2e2ccb8c60de192 diff --git a/x11-misc/qt5ct/qt5ct-1.9.ebuild b/x11-misc/qt5ct/qt5ct-1.9.ebuild new file mode 100644 index 000000000000..94c08b320c08 --- /dev/null +++ b/x11-misc/qt5ct/qt5ct-1.9.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Qt5 configuration tool, similar to qtconfig for Qt4" +HOMEPAGE="https://sourceforge.net/projects/qt5ct/" +SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86" + +RDEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5=[dbus] + dev-qt/qtwidgets:5 +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/linguist-tools:5 + dev-qt/qtpaths:5 +" + +src_install() { + cmake_src_install + + newenvd - 98qt5ct <<< 'QT_QPA_PLATFORMTHEME=qt5ct' +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + ewarn "qt5ct configuration won't be applied to the currently running sessions." + ewarn "Please relogin." + fi + if ! has_version 'dev-qt/qtsvg:5'; then + elog + elog "For SVG icon themes, please install 'dev-qt/qtsvg:5'." + elog + fi +} diff --git a/x11-misc/rendercheck/rendercheck-1.6.ebuild b/x11-misc/rendercheck/rendercheck-1.6.ebuild index 46d943b16e27..9d5943e0a598 100644 --- a/x11-misc/rendercheck/rendercheck-1.6.ebuild +++ b/x11-misc/rendercheck/rendercheck-1.6.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MODULE=test/ -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 meson if [[ ${PV} != *9999* ]]; then diff --git a/x11-misc/rendercheck/rendercheck-9999.ebuild b/x11-misc/rendercheck/rendercheck-9999.ebuild index e42d18b33391..c9265373ea8b 100644 --- a/x11-misc/rendercheck/rendercheck-9999.ebuild +++ b/x11-misc/rendercheck/rendercheck-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MODULE=test/ -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 meson if [[ ${PV} != *9999* ]]; then diff --git a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild deleted file mode 100644 index a3fe3b3b176b..000000000000 --- a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -DESCRIPTION="A file browser for rofi" -HOMEPAGE="https://github.com/marvinkreis/rofi-file-browser-extended" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/marvinkreis/${PN}.git" -else - SRC_URI="https://github.com/marvinkreis/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~x86" -fi - -LICENSE="MIT" -SLOT="0" - -BDEPEND="virtual/pkgconfig" -COMMON_DEPEND=" - dev-libs/glib:2 - x11-misc/rofi -" -DEPEND=" - ${COMMON_DEPEND} - x11-libs/cairo -" -RDEPEND="${COMMON_DEPEND}" - -PATCHES=( - # https://bugs.gentoo.org/880985 https://github.com/marvinkreis/rofi-file-browser-extended/pull/49 - "${FILESDIR}/${PN}-1.3.1-fix-function-pointer-initialization.patch" -) - -src_prepare() { - # Delete the lines in CMakeLists.txt that install the man page. - sed -i "45,56d" CMakeLists.txt || die - cmake_src_prepare -} - -src_install() { - cmake_src_install - doman "doc/${PN}.1" -} diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest index 75d274fd3f64..5049c4406197 100644 --- a/x11-misc/rofi/Manifest +++ b/x11-misc/rofi/Manifest @@ -1 +1,4 @@ DIST rofi-1.7.5.tar.xz 772952 BLAKE2B 54511f4f793f3ba0b58294daa1d2974228904a637d13d729b0b7d974c0ebf8d0d98514705212bd42500fe90b0685a3515dc67793baa95baefe6dfc0ecdee83c7 SHA512 84cbb8ccef14fdb5d68062b17245fbcb0e9bab46534eb6c7ce532750b86fb33ce6e43ed24cf3c65e553d15b23a201c9168d97d257da4dddeddb0a7c44dd59cc0 +DIST rofi-1.7.6.tar.xz 812496 BLAKE2B 18728bde962a1082927c87c19e00356206632430975f8718f2d961966047026a2cb1266ed868f4510fbe127e7f3e3cae1308a9da69fe46609f78dbc0e8394d2f SHA512 9e2d39abd3dbd7703646e6c0f16383da8f1ec26b911817f574f388cd019c9440fca26100d2de14883c30e74f6c1c451722777dbeee1d2551fc64d78d60fa3023 +DIST rofi-1.7.7.tar.xz 812568 BLAKE2B b5b341d13f2d8609994e9b138722ce6af3896394b60a6734e90ac50cd7921704dcacd3fcbdbc3c1ce4632df1995f7abc1c6399371a483721424181bb9a7b9a69 SHA512 8286bc5f33ab4eb93677b24815730f159347a1e545ff109784fe161eeb4500c4fd4307c7894adb2060d6bef5137c9d6506a71c565e2676be230e5ad740bed9d0 +DIST rofi-1.7.8.tar.xz 812732 BLAKE2B 8f6ecf0ff9db4ccadcf8814ae014e0a1041a2494d934214bd9f22487ff9c73f35ec1a6c7ead8f764a0ac64d248260b550effec1102acb0e8e757e8c6a270241f SHA512 8a33f5eb933cbba645056eeba3b82e236135e5a72251bd5bb3e6019e66e5626b126572f6874f5e39e381bb5108f261d4c80bb945ed0900c2179854d475d6518b diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml index 76403db3f6b0..8e8eedee6d0a 100644 --- a/x11-misc/rofi/metadata.xml +++ b/x11-misc/rofi/metadata.xml @@ -11,5 +11,7 @@ </use> <upstream> <remote-id type="github">davatorium/rofi</remote-id> + <changelog>https://github.com/davatorium/rofi/releases</changelog> + <bugs-to>https://github.com/davatorium/rofi/issues</bugs-to> </upstream> </pkgmetadata> diff --git a/x11-misc/rofi/rofi-1.7.6-r2.ebuild b/x11-misc/rofi/rofi-1.7.6-r2.ebuild new file mode 100644 index 000000000000..99c15ca7964b --- /dev/null +++ b/x11-misc/rofi/rofi-1.7.6-r2.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson toolchain-funcs xdg-utils + +DESCRIPTION="A window switcher, run dialog and dmenu replacement" +HOMEPAGE="https://github.com/davatorium/rofi" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/davatorium/rofi" + inherit git-r3 +else + SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="+drun test +windowmode" +RESTRICT="!test? ( test )" + +BDEPEND=" + sys-devel/bison + >=sys-devel/flex-2.5.39 + virtual/pkgconfig +" +RDEPEND=" + >=dev-libs/glib-2.72:2 + x11-libs/cairo[X,xcb(+)] + x11-libs/gdk-pixbuf:2 + x11-libs/libxcb:= + x11-libs/libxkbcommon[X] + x11-libs/pango[X] + x11-libs/startup-notification + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-wm + x11-misc/xkeyboard-config +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto + x11-libs/xcb-util-keysyms + test? ( >=dev-libs/check-0.11 ) +" + +DOCS=( + AUTHORS + Changelog + Examples/ + README.md +) + +src_configure() { + # Doesn't work with reflex, bug #887049 + export LEX=flex + + # Requires bison, see https://bugs.gentoo.org/894634. + unset YACC + + tc-export CC + + local emesonargs=( + $(meson_use drun) + $(meson_use windowmode window) + $(meson_feature test check) + -Dimdkit=false + ) + meson_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-misc/rofi/rofi-1.7.7.ebuild b/x11-misc/rofi/rofi-1.7.7.ebuild new file mode 100644 index 000000000000..99c15ca7964b --- /dev/null +++ b/x11-misc/rofi/rofi-1.7.7.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson toolchain-funcs xdg-utils + +DESCRIPTION="A window switcher, run dialog and dmenu replacement" +HOMEPAGE="https://github.com/davatorium/rofi" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/davatorium/rofi" + inherit git-r3 +else + SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="+drun test +windowmode" +RESTRICT="!test? ( test )" + +BDEPEND=" + sys-devel/bison + >=sys-devel/flex-2.5.39 + virtual/pkgconfig +" +RDEPEND=" + >=dev-libs/glib-2.72:2 + x11-libs/cairo[X,xcb(+)] + x11-libs/gdk-pixbuf:2 + x11-libs/libxcb:= + x11-libs/libxkbcommon[X] + x11-libs/pango[X] + x11-libs/startup-notification + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-wm + x11-misc/xkeyboard-config +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto + x11-libs/xcb-util-keysyms + test? ( >=dev-libs/check-0.11 ) +" + +DOCS=( + AUTHORS + Changelog + Examples/ + README.md +) + +src_configure() { + # Doesn't work with reflex, bug #887049 + export LEX=flex + + # Requires bison, see https://bugs.gentoo.org/894634. + unset YACC + + tc-export CC + + local emesonargs=( + $(meson_use drun) + $(meson_use windowmode window) + $(meson_feature test check) + -Dimdkit=false + ) + meson_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-misc/rofi/rofi-1.7.8.ebuild b/x11-misc/rofi/rofi-1.7.8.ebuild new file mode 100644 index 000000000000..99c15ca7964b --- /dev/null +++ b/x11-misc/rofi/rofi-1.7.8.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson toolchain-funcs xdg-utils + +DESCRIPTION="A window switcher, run dialog and dmenu replacement" +HOMEPAGE="https://github.com/davatorium/rofi" + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/davatorium/rofi" + inherit git-r3 +else + SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="+drun test +windowmode" +RESTRICT="!test? ( test )" + +BDEPEND=" + sys-devel/bison + >=sys-devel/flex-2.5.39 + virtual/pkgconfig +" +RDEPEND=" + >=dev-libs/glib-2.72:2 + x11-libs/cairo[X,xcb(+)] + x11-libs/gdk-pixbuf:2 + x11-libs/libxcb:= + x11-libs/libxkbcommon[X] + x11-libs/pango[X] + x11-libs/startup-notification + x11-libs/xcb-util + x11-libs/xcb-util-cursor + x11-libs/xcb-util-wm + x11-misc/xkeyboard-config +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto + x11-libs/xcb-util-keysyms + test? ( >=dev-libs/check-0.11 ) +" + +DOCS=( + AUTHORS + Changelog + Examples/ + README.md +) + +src_configure() { + # Doesn't work with reflex, bug #887049 + export LEX=flex + + # Requires bison, see https://bugs.gentoo.org/894634. + unset YACC + + tc-export CC + + local emesonargs=( + $(meson_use drun) + $(meson_use windowmode window) + $(meson_feature test check) + -Dimdkit=false + ) + meson_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-misc/rofi/rofi-9999.ebuild b/x11-misc/rofi/rofi-9999.ebuild index aa90b0c02f84..99c15ca7964b 100644 --- a/x11-misc/rofi/rofi-9999.ebuild +++ b/x11-misc/rofi/rofi-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools toolchain-funcs xdg-utils +inherit meson toolchain-funcs xdg-utils DESCRIPTION="A window switcher, run dialog and dmenu replacement" HOMEPAGE="https://github.com/davatorium/rofi" @@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then inherit git-r3 else SRC_URI="https://github.com/davatorium/rofi/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~riscv x86" + KEYWORDS="~amd64 ~arm64 ~riscv ~x86" fi LICENSE="MIT" @@ -27,7 +27,7 @@ BDEPEND=" virtual/pkgconfig " RDEPEND=" - dev-libs/glib:2 + >=dev-libs/glib-2.72:2 x11-libs/cairo[X,xcb(+)] x11-libs/gdk-pixbuf:2 x11-libs/libxcb:= @@ -42,13 +42,16 @@ RDEPEND=" DEPEND=" ${RDEPEND} x11-base/xorg-proto + x11-libs/xcb-util-keysyms test? ( >=dev-libs/check-0.11 ) " -src_prepare() { - default - eautoreconf -} +DOCS=( + AUTHORS + Changelog + Examples/ + README.md +) src_configure() { # Doesn't work with reflex, bug #887049 @@ -59,12 +62,13 @@ src_configure() { tc-export CC - local myeconfargs=( - $(use_enable drun) - $(use_enable test check) - $(use_enable windowmode) + local emesonargs=( + $(meson_use drun) + $(meson_use windowmode window) + $(meson_feature test check) + -Dimdkit=false ) - econf "${myeconfargs[@]}" + meson_src_configure } pkg_postinst() { diff --git a/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild deleted file mode 100644 index 951fc14b7ddb..000000000000 --- a/x11-misc/rss-glx/rss-glx-0.9.1-r3.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -MY_P=${PN}_${PV} - -DESCRIPTION="Really Slick OpenGL Screensavers for XScreenSaver" -HOMEPAGE="http://rss-glx.sourceforge.net" -SRC_URI="https://downloads.sourceforge.net/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86" -IUSE="+bzip2 openal quesoglc" - -RDEPEND=" - x11-libs/libX11 - x11-libs/libXext - >=media-libs/glew-1.5.1:= - media-libs/mesa[X(+)] - >=media-gfx/imagemagick-6.4:= - >=x11-misc/xscreensaver-5.08-r2 - bzip2? ( app-arch/bzip2 ) - openal? ( >=media-libs/freealut-1.1.0-r1 ) - quesoglc? ( media-libs/quesoglc )" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" -BDEPEND=" - virtual/pkgconfig - bzip2? ( app-arch/bzip2 )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-quesoglc.patch - "${FILESDIR}"/${P}-asneeded.patch - "${FILESDIR}"/${P}-imagemagick-7.patch - "${FILESDIR}"/${P}-c++11-narrowing.patch - "${FILESDIR}"/${P}-hang.patch - "${FILESDIR}"/${P}-matrixview-copy-font.patch - "${FILESDIR}"/${P}-missing-include.patch - "${FILESDIR}"/${P}-bashism.patch -) - -src_prepare() { - default - - sed -i \ - -e '/CFLAGS=/s:-O2:${CFLAGS}:' \ - -e '/CXXFLAGS=/s:-O2:${CXXFLAGS}:' \ - -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ - configure.in || die - mv configure.{in,ac} || die - - eautoreconf -} - -src_configure() { - econf \ - --disable-static \ - --enable-shared \ - $(use_enable bzip2) \ - $(use_enable openal sound) \ - $(use_with quesoglc) \ - --bindir="${EPREFIX}"/usr/$(get_libdir)/misc/xscreensaver \ - --with-configdir="${EPREFIX}"/usr/share/xscreensaver/config -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - local xssconf="${EROOT}"/usr/share/X11/app-defaults/XScreenSaver - - if [[ -f ${xssconf} ]]; then - sed -e '/*programs:/a\ - GL: \"Cyclone\" cyclone --root \\n\\\ - GL: \"Euphoria\" euphoria --root \\n\\\ - GL: \"Fieldlines\" fieldlines --root \\n\\\ - GL: \"Flocks\" flocks --root \\n\\\ - GL: \"Flux\" flux --root \\n\\\ - GL: \"Helios\" helios --root \\n\\\ - GL: \"Hyperspace\" hyperspace --root \\n\\\ - GL: \"Lattice\" lattice --root \\n\\\ - GL: \"Plasma\" plasma --root \\n\\\ - GL: \"Pixelcity\" pixelcity --root \\n\\\ - GL: \"Skyrocket\" skyrocket --root \\n\\\ - GL: \"Solarwinds\" solarwinds --root \\n\\\ - GL: \"Colorfire\" colorfire --root \\n\\\ - GL: \"Hufo\x27s Smoke\" hufo_smoke --root \\n\\\ - GL: \"Hufo\x27s Tunnel\" hufo_tunnel --root \\n\\\ - GL: \"Sundancer2\" sundancer2 --root \\n\\\ - GL: \"BioF\" biof --root \\n\\\ - GL: \"BusySpheres\" busyspheres --root \\n\\\ - GL: \"SpirographX\" spirographx --root \\n\\\ - GL: \"MatrixView\" matrixview --root \\n\\\ - GL: \"Lorenz\" lorenz --root \\n\\\ - GL: \"Drempels\" drempels --root \\n\\\ - GL: \"Feedback\" feedback --root \\n\\' \ - -i "${xssconf}" || die - fi -} - -pkg_postrm() { - local xssconf="${EROOT}"/usr/share/X11/app-defaults/XScreenSaver - - if [[ -f ${xssconf} ]]; then - sed \ - -e '/\"Cyclone\" cyclone/d' \ - -e '/\"Euphoria\" euphoria/d' \ - -e '/\"Fieldlines\" fieldlines/d' \ - -e '/\"Flocks\" flocks/d' \ - -e '/\"Flux\" flux/d' \ - -e '/\"Helios\" helios/d' \ - -e '/\"Hyperspace\" hyperspace/d' \ - -e '/\"Lattice\" lattice/d' \ - -e '/\"Plasma\" plasma/d' \ - -e '/\"Pixelcity\" pixelcity/d' \ - -e '/\"Skyrocket\" skyrocket/d' \ - -e '/\"Solarwinds\" solarwinds/d' \ - -e '/\"Colorfire\" colorfire/d' \ - -e '/\"Hufo.*Smoke\" hufo_smoke/d' \ - -e '/\"Hufo.*Tunnel\" hufo_tunnel/d' \ - -e '/\"Sundancer2\" sundancer2/d' \ - -e '/\"BioF\" biof/d' \ - -e '/\"BusySpheres\" busyspheres/d' \ - -e '/\"SpirographX\" spirographx/d' \ - -e '/\"MatrixView\" matrixview/d' \ - -e '/\"Lorenz\" lorenz/d' \ - -e '/\"Drempels\" drempels/d' \ - -e '/\"Feedback\" feedback/d' \ - -i "${xssconf}" || die - fi -} diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest index 928e70238662..d814fa44c6d9 100644 --- a/x11-misc/safeeyes/Manifest +++ b/x11-misc/safeeyes/Manifest @@ -1,5 +1,2 @@ -DIST safeeyes-2.1.6.tar.gz 286359 BLAKE2B a5e4b4d680d455f2ae9494705f1e4508341802f4826b2d11f5407eed4074f0eab45066a3741745dd164b47e26a2dbf2a393945bffef0f747cbebd5f87b3b1961 SHA512 6476284ed1d8cdde77f10b3fe962a5d9d5ead944b0418f797e375cc67affa6807d858279cf4a1189585b7688dbe983fc6b90c917e0e55a2a11ebfdc56b44ca93 -DIST safeeyes-2.1.8.tar.gz 288991 BLAKE2B 53fa71171c42679f7241a13b5542855c542c020814a4ec9e9c7480163bc2179e93787fb87291999815f900d5dea3522f5de8e35e85b714d3cb1cc4e24bad5638 SHA512 df3192ee751510449a0ee8946c8e59daff3dc5b4ef95a2f5563cc82834fbe8d3de52f39be2e0c26c13db7ac3d115ef1de63184ec8d069b99f411f4d60e9b5139 -DIST safeeyes-2.1.9.tar.gz 288598 BLAKE2B 4a8892758220d7422c9d58b0dfcaef19c4a7cbef1266dc593321d2abaeafee5857dff277d16a4a98c5fdd745cdf305762f593e04c1cf9f9886d3e79486108c5c SHA512 2a752686c101bd3a952ed11b7c68e692077220663ac36ee73343d001807bb5d7c02477cb45ab92be99fd8463f436570caf021ae1a064079fcecd82447c13c3ac -DIST safeeyes-2.2.0.tar.gz 291116 BLAKE2B a1650447c04fa828d58fd650488eeec47699da4b16476d58471ec396c4f724e516e16069b748cd94e215b1dd1d75f716d1955f7488f39d412fbe7b53dc27f5ea SHA512 f3b6679ad7f8a9983f466ef5b29a67bed62ffb95aff2468401eefa543e359e9c2470b593e27023874e1400d6569ac55decfb024a9ad81ba07a8989d70af7dab0 DIST safeeyes-2.2.2.tar.gz 312701 BLAKE2B 73e316c699bb1b6a1291bc2afefc228067d692352788cbd68904917bbea8d8d566e3a3b764d44cb8be37d75a89a97326f153be98b69b800c42f49b0e9668dfd5 SHA512 b84f3bdeae06bc0db88a7ef1c029f8896880bd4f0cdf624eb332eb974dbfca4ce766f13d41b275747098016b3b3dbe4f1fe4ac544448916a641913ddf0a18f77 +DIST safeeyes-2.2.3.tar.gz 319259 BLAKE2B 70eea85d1427bcde826890db770723564f601a6a7dfc04aee02d72fa43f1ed0e27acbef055f2acf27050a390cf079a817e978b5321982d9de172d39669c95f57 SHA512 4ecdf27527b81454c0f6f20c534634d7ed8f15c3903c1a39acf98eb97064ce33b6b7bb77ffa98e49520698335e9680130b701e215382565fca12f2608b71cd6f diff --git a/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch b/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch deleted file mode 100644 index 93430da89b88..000000000000 --- a/x11-misc/safeeyes/files/safeeyes-2.1.6-py312.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 043d9c5018431b3b41cc2bcfacdaaa7f0db1563c Mon Sep 17 00:00:00 2001 -From: Alyssa Rosenzweig <alyssa@rosenzweig.io> -Date: Thu, 9 Nov 2023 12:14:13 -0400 -Subject: [PATCH] Fix with python3.12 - -imp is deprecated in 3.4 and removed in 3.12. this caused safe eyes to -break on upgrading to fedora 39 - -Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> ---- - safeeyes/utility.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/safeeyes/utility.py b/safeeyes/utility.py -index e145d4d..3976140 100644 ---- a/safeeyes/utility.py -+++ b/safeeyes/utility.py -@@ -21,7 +21,6 @@ - """ - - import errno --import imp - import inspect - import importlib - import json -@@ -355,7 +354,7 @@ def module_exist(module): - Check wther the given Python module exists or not. - """ - try: -- imp.find_module(module) -+ importlib.util.find_spec(module) - return True - except ImportError: - return False diff --git a/x11-misc/safeeyes/safeeyes-2.1.6-r3.ebuild b/x11-misc/safeeyes/safeeyes-2.1.6-r3.ebuild deleted file mode 100644 index 2c3b4abd7624..000000000000 --- a/x11-misc/safeeyes/safeeyes-2.1.6-r3.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py -DISTUTILS_USE_PEP517=setuptools - -inherit xdg distutils-r1 pypi - -DESCRIPTION="Linux alternative to EyeLeo" -HOMEPAGE="https://github.com/slgobinath/SafeEyes" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" - -PATCHES=( - "${FILESDIR}"/${P}-py312.patch -) - -RDEPEND=" - dev-libs/libayatana-appindicator - dev-python/babel[${PYTHON_USEDEP}] - dev-python/croniter[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/python-xlib[${PYTHON_USEDEP}] - media-sound/alsa-utils - x11-apps/xprop - x11-libs/gtk+:3[introspection] - x11-libs/libnotify[introspection] - x11-misc/xprintidle - " - -python_install() { - distutils-r1_python_install - - # Workaround for https://bugs.gentoo.org/926816 - # Files were misplaced and also duplicate across Python slots. - local misplaced_usr="${D}/usr/lib/${EPYTHON}/site-packages/usr" - local i - for i in applications icons ; do - local source="${misplaced_usr}/share/${i}" - local target="${D}/usr/share/${i}" - if [[ ! -d "${target}" ]]; then - dodir /usr/share/ - mv "${source}" "${target}" || die - fi - done - rm -R "${misplaced_usr}" || 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-misc/safeeyes/safeeyes-2.1.8.ebuild b/x11-misc/safeeyes/safeeyes-2.1.8.ebuild deleted file mode 100644 index cc081995bcc0..000000000000 --- a/x11-misc/safeeyes/safeeyes-2.1.8.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 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py -DISTUTILS_USE_PEP517=setuptools - -inherit xdg distutils-r1 pypi - -DESCRIPTION="Linux alternative to EyeLeo" -HOMEPAGE="https://github.com/slgobinath/SafeEyes" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" - -RDEPEND=" - dev-libs/libayatana-appindicator - dev-python/babel[${PYTHON_USEDEP}] - dev-python/croniter[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/python-xlib[${PYTHON_USEDEP}] - media-sound/alsa-utils - x11-apps/xprop - x11-libs/gtk+:3[introspection] - x11-libs/libnotify[introspection] - x11-misc/xprintidle - " - -python_install() { - distutils-r1_python_install - - # Workaround for https://bugs.gentoo.org/926816 - # Files were misplaced and also duplicate across Python slots. - local misplaced_usr="${D}/usr/lib/${EPYTHON}/site-packages/usr" - local i - for i in applications icons ; do - local source="${misplaced_usr}/share/${i}" - local target="${D}/usr/share/${i}" - if [[ ! -d "${target}" ]]; then - dodir /usr/share/ - mv "${source}" "${target}" || die - fi - done - rm -R "${misplaced_usr}" || 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-misc/safeeyes/safeeyes-2.1.9.ebuild b/x11-misc/safeeyes/safeeyes-2.1.9.ebuild deleted file mode 100644 index cc081995bcc0..000000000000 --- a/x11-misc/safeeyes/safeeyes-2.1.9.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 - -PYTHON_COMPAT=( python3_{10..12} ) -PYTHON_REQ_USE="tk" # for site-packages/Xlib/ext/randr.py -DISTUTILS_USE_PEP517=setuptools - -inherit xdg distutils-r1 pypi - -DESCRIPTION="Linux alternative to EyeLeo" -HOMEPAGE="https://github.com/slgobinath/SafeEyes" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~riscv ~x86" - -RDEPEND=" - dev-libs/libayatana-appindicator - dev-python/babel[${PYTHON_USEDEP}] - dev-python/croniter[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - dev-python/python-xlib[${PYTHON_USEDEP}] - media-sound/alsa-utils - x11-apps/xprop - x11-libs/gtk+:3[introspection] - x11-libs/libnotify[introspection] - x11-misc/xprintidle - " - -python_install() { - distutils-r1_python_install - - # Workaround for https://bugs.gentoo.org/926816 - # Files were misplaced and also duplicate across Python slots. - local misplaced_usr="${D}/usr/lib/${EPYTHON}/site-packages/usr" - local i - for i in applications icons ; do - local source="${misplaced_usr}/share/${i}" - local target="${D}/usr/share/${i}" - if [[ ! -d "${target}" ]]; then - dodir /usr/share/ - mv "${source}" "${target}" || die - fi - done - rm -R "${misplaced_usr}" || 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-misc/safeeyes/safeeyes-2.2.0.ebuild b/x11-misc/safeeyes/safeeyes-2.2.3.ebuild index 7d37c5968b2f..ad0c9a25dafa 100644 --- a/x11-misc/safeeyes/safeeyes-2.2.0.ebuild +++ b/x11-misc/safeeyes/safeeyes-2.2.3.ebuild @@ -20,7 +20,6 @@ RDEPEND=" dev-libs/libayatana-appindicator dev-python/babel[${PYTHON_USEDEP}] dev-python/croniter[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] diff --git a/x11-misc/screengrab/screengrab-2.9.0.ebuild b/x11-misc/screengrab/screengrab-2.9.0.ebuild index c912f4e08772..398883d43eb7 100644 --- a/x11-misc/screengrab/screengrab-2.9.0.ebuild +++ b/x11-misc/screengrab/screengrab-2.9.0.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 @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" fi LICENSE="GPL-2 GPL-2+ LGPL-2.1+" diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest index 5eaf19f0fc31..7ae0a7e2576a 100644 --- a/x11-misc/sddm/Manifest +++ b/x11-misc/sddm/Manifest @@ -1,4 +1,2 @@ -DIST sddm-0.18.1-patchset.tar.xz 7860 BLAKE2B b79738c58f19ebac24dd790ba7613d85ae78bc0c5161d35249e13ddbac3acefff2753b8d92fa47a73a607b3105310ea5d05e1a5a170068030fe28420ffee88b1 SHA512 30ca961f065188d570b1498f9eea5aeafb31ab53b7e9ce41e98e26cba12f8c16a245fffb25ea4d84c6fb9037a24523cd41acc9a8b140a1420282435c9497d9b4 -DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60 DIST sddm-0.21.0-pam.tar.xz 676 BLAKE2B 06a79f74a5833eca9877df4be8639311382d13061b21aa3627e6c4b07725878ded62221fca943440bacc143f6be2a23b2e0a2124012ff2c9fac82e1eded11144 SHA512 6d91eef2434346f7707122454522cf19f104994ac95d562417f6060a92b4e6c9792bebcccabac8290479200b4ba02fc4d92c6098c435c7ceda796d619d8913c2 DIST sddm-0.21.0_p20240723.tar.gz 3557578 BLAKE2B b92feb20a39eaf34822b077fcb8b89a100ff65814f9b523b2a1a0ffd3592edf2e86fa8fbdfcd8b592756a0b4baf0b085e8c7b4ad2aaa2f08b90e25e580df9925 SHA512 1ea2f758099f86086aebf05a77b176227475c1eb9c21c77bc99b9bb5a2882ce087e020ae6a11585b793fe09a3567e0ea4d0c1632a5823b7be83e33882964de48 diff --git a/x11-misc/sddm/sddm-0.18.1-r8.ebuild b/x11-misc/sddm/sddm-0.18.1-r8.ebuild deleted file mode 100644 index 0f35ab30d4eb..000000000000 --- a/x11-misc/sddm/sddm-0.18.1-r8.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PATCHSET="${P}-patchset" -inherit cmake linux-info systemd tmpfiles - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" - -LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="+elogind +pam systemd test" - -REQUIRED_USE="?? ( elogind systemd )" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - acct-group/sddm - acct-user/sddm - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - x11-base/xorg-server - x11-libs/libxcb:= - elogind? ( sys-auth/elogind ) - pam? ( sys-libs/pam ) - !pam? ( virtual/libcrypt:= ) - systemd? ( sys-apps/systemd:= ) - !systemd? ( sys-power/upower ) -" -DEPEND="${COMMON_DEPEND} - test? ( dev-qt/qttest:5 ) -" -RDEPEND="${COMMON_DEPEND} - !systemd? ( gui-libs/display-manager-init ) -" -BDEPEND=" - dev-python/docutils - dev-qt/linguist-tools:5 - kde-frameworks/extra-cmake-modules:0 - virtual/pkgconfig -" - -PATCHES=( - "${WORKDIR}/${PATCHSET}/${P}-respect-user-flags.patch" - "${WORKDIR}/${PATCHSET}/${P}-Xsession.patch" # bug 611210 - "${WORKDIR}/${PATCHSET}/${PN}-0.18.0-sddmconfdir.patch" - # fix for groups: https://github.com/sddm/sddm/issues/1159 - "${WORKDIR}/${PATCHSET}/${P}-revert-honor-PAM-supplemental-groups.patch" - "${WORKDIR}/${PATCHSET}/${P}-honor-PAM-supplemental-groups-v2.patch" - # fix for ReuseSession=true - "${WORKDIR}/${PATCHSET}/${P}-only-reuse-online-sessions.patch" - # TODO: fix properly - "${WORKDIR}/${PATCHSET}/pam-1.4-substack.patch" - # upstream git develop branch: - "${WORKDIR}/${PATCHSET}/${P}-qt-5.15.2.patch" - "${WORKDIR}/${PATCHSET}/${P}-cve-2020-28049.patch" # bug 753104 - "${WORKDIR}/${PATCHSET}/${P}-nvidia-glitches-vt-switch.patch" - "${WORKDIR}/${PATCHSET}/${P}-drop-wayland-suffix.patch" - "${WORKDIR}/${PATCHSET}/${P}-fix-qt-5.15.7.patch" # KDE-bug 458865 -) - -pkg_setup() { - local CONFIG_CHECK="~DRM" - use kernel_linux && linux-info_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - if ! use test; then - sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die - cmake_comment_add_subdirectory test - fi -} - -src_configure() { - local mycmakeargs=( - -DENABLE_PAM=$(usex pam) - -DNO_SYSTEMD=$(usex '!systemd') - -DUSE_ELOGIND=$(usex 'elogind') - -DBUILD_MAN_PAGES=ON - -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - newtmpfiles "${WORKDIR}/${PATCHSET}/${PN}.tmpfiles" "${PN}.conf" - - # Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement - local confd="/usr/share/sddm/sddm.conf.d" - dodir ${confd} - "${D}"/usr/bin/sddm --example-config > "${D}/${confd}"/00default.conf \ - || die "Failed to create 00default.conf" - - sed -e "/^InputMethod/s/qtvirtualkeyboard//" \ - -e "/^ReuseSession/s/false/true/" \ - -e "/^EnableHiDPI/s/false/true/" \ - -i "${D}/${confd}"/00default.conf || die -} - -pkg_postinst() { - tmpfiles_process "${PN}.conf" - - elog "Starting with 0.18.0, SDDM no longer installs /etc/sddm.conf" - elog "Use it to override specific options. SDDM defaults are now" - elog "found in: /usr/share/sddm/sddm.conf.d/00default.conf" - elog - elog "NOTE: If SDDM startup appears to hang then entropy pool is too low." - elog "This can be fixed by configuring one of the following:" - elog " - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel" - elog " - # emerge sys-apps/haveged && rc-update add haveged boot" - elog " - # emerge sys-apps/rng-tools && rc-update add rngd boot" - elog - elog "For more information on how to configure SDDM, please visit the wiki:" - elog " https://wiki.gentoo.org/wiki/SDDM" - if has_version x11-drivers/nvidia-drivers; then - elog - elog " Nvidia GPU owners in particular should pay attention" - elog " to the troubleshooting section." - fi - - systemd_reenable sddm.service -} diff --git a/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild b/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild index 7024c639d357..37d61531c354 100644 --- a/x11-misc/sddm/sddm-0.21.0_p20240723-r10.ebuild +++ b/x11-misc/sddm/sddm-0.21.0_p20240723-r10.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 @@ -11,7 +11,7 @@ else COMMIT=4ec29a8bba033d475f197693fac6cb0c383a1da2 SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" fi QTMIN=6.7.2 diff --git a/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild b/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild deleted file mode 100644 index b7a18e066574..000000000000 --- a/x11-misc/sddm/sddm-0.21.0_p20240723.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PAM_TAR="${PN}-0.21.0-pam" -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" -else - COMMIT=4ec29a8bba033d475f197693fac6cb0c383a1da2 - SRC_URI="https://github.com/${PN}/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -fi - -QTMIN=5.15.12 -inherit cmake linux-info optfeature pam systemd tmpfiles - -DESCRIPTION="Simple Desktop Display Manager" -HOMEPAGE="https://github.com/sddm/sddm" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PAM_TAR}.tar.xz" - -LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain" -SLOT="0" -IUSE="+elogind systemd test" - -REQUIRED_USE="^^ ( elogind systemd )" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - acct-group/sddm - acct-user/sddm - >=dev-qt/qtcore-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - sys-libs/pam - x11-libs/libXau - x11-libs/libxcb:= - elogind? ( - sys-auth/elogind[pam] - sys-power/upower - ) - systemd? ( sys-apps/systemd:=[pam] ) -" -DEPEND="${COMMON_DEPEND} - test? ( >=dev-qt/qttest-${QTMIN}:5 ) -" -RDEPEND="${COMMON_DEPEND} - x11-base/xorg-server - !systemd? ( gui-libs/display-manager-init ) -" -BDEPEND=" - dev-python/docutils - >=dev-build/cmake-3.25.0 - >=dev-qt/linguist-tools-${QTMIN}:5 - kde-frameworks/extra-cmake-modules:0 - virtual/pkgconfig -" - -PATCHES=( - # Downstream patches - "${FILESDIR}/${PN}-0.20.0-respect-user-flags.patch" - "${FILESDIR}/${PN}-0.21.0-Xsession.patch" # bug 611210 -) - -pkg_setup() { - local CONFIG_CHECK="~DRM" - use kernel_linux && linux-info_pkg_setup -} - -src_unpack() { - [[ ${PV} == *9999* ]] && git-r3_src_unpack - default -} - -src_prepare() { - touch 01gentoo.conf || die - -cat <<-EOF >> 01gentoo.conf -[General] -# Remove qtvirtualkeyboard as InputMethod default -InputMethod= -EOF - - cmake_src_prepare - - if ! use test; then - sed -e "/^find_package/s/ Test//" -i CMakeLists.txt || die - cmake_comment_add_subdirectory test - fi - - if use systemd; then - sed -e "/pam_elogind.so/s/elogind/systemd/" \ - -i "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam || die - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_MAN_PAGES=ON - -DBUILD_WITH_QT6=OFF # default theme (and others) not yet compatible - -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf" - -DRUNTIME_DIR=/run/sddm - -DSYSTEMD_TMPFILES_DIR="/usr/lib/tmpfiles.d" - -DNO_SYSTEMD=$(usex !systemd) - -DUSE_ELOGIND=$(usex elogind) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - insinto /etc/sddm.conf.d/ - doins "${S}"/01gentoo.conf - - # with systemd logs are sent to journald, so no point to bother in that case - if ! use systemd; then - insinto /etc/logrotate.d - newins "${FILESDIR}/sddm.logrotate" sddm - fi - - newpamd "${WORKDIR}"/${PAM_TAR}/${PN}.pam ${PN} - newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-autologin.pam ${PN}-autologin - newpamd "${WORKDIR}"/${PAM_TAR}/${PN}-greeter.pam ${PN}-greeter -} - -pkg_postinst() { - tmpfiles_process "${PN}.conf" - - elog "NOTE: If SDDM startup appears to hang then entropy pool is too low." - elog "This can be fixed by configuring one of the following:" - elog " - Enable CONFIG_RANDOM_TRUST_CPU in linux kernel" - elog " - # emerge sys-apps/haveged && rc-update add haveged boot" - elog " - # emerge sys-apps/rng-tools && rc-update add rngd boot" - elog - elog "SDDM example config can be shown with:" - elog " ${EROOT}/usr/bin/sddm --example-config" - elog "Use ${EROOT}/etc/sddm.conf.d/ directory to override specific options." - elog - elog "For more information on how to configure SDDM, please visit the wiki:" - elog " https://wiki.gentoo.org/wiki/SDDM" - if has_version x11-drivers/nvidia-drivers; then - elog - elog " Nvidia GPU owners in particular should pay attention" - elog " to the troubleshooting section." - fi - - optfeature "Weston DisplayServer support (EXPERIMENTAL)" "dev-libs/weston[kiosk]" - optfeature "KWin DisplayServer support (EXPERIMENTAL)" "kde-plasma/kwin" - - systemd_reenable sddm.service -} diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest index 99285f181a91..12871d4ed014 100644 --- a/x11-misc/shutter/Manifest +++ b/x11-misc/shutter/Manifest @@ -1,2 +1 @@ -DIST shutter-0.99.4.tar.gz 1734992 BLAKE2B 410e73f784f0d83638867132669a00fe89c06af622f3024e52b5b5700c1a431b4ad50f9066c267cd76f9be48ce6ff88eab4348d2d4dff28b4ae7e0267eb7bc41 SHA512 57f7fdc1066375942bd1a9db381a8ba6f24fafbd5e0853a4dd19016438ec2f3cb039ebe90038d282bc07f6e45af9cdbb6f180f55e43357231b41818b8555347b DIST shutter-0.99.5.tar.gz 1736757 BLAKE2B b861d4c71295ceb1e8a2d268e57babccb8a832245ffb18410c19b20bb5aca56358e00cb4e578f3b8dfcd15e4c318beb7ed873a86094de522deed7f4b2e33b58c SHA512 524e135191a324f7da890922c98646c7cd83a714a3b1dc14f2ba9910f8a90f5c6c527a5c857888c2be93120a7b242e435664c8af45792d36b66d7642fda50371 diff --git a/x11-misc/shutter/shutter-0.99.4-r1.ebuild b/x11-misc/shutter/shutter-0.99.4-r1.ebuild deleted file mode 100644 index c2b4f443b835..000000000000 --- a/x11-misc/shutter/shutter-0.99.4-r1.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop optfeature prefix xdg - -DESCRIPTION="Feature-rich screenshot program" -HOMEPAGE="https://shutter-project.org/" -SRC_URI="https://github.com/shutter-project/shutter/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~riscv x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-lang/perl - dev-libs/libayatana-appindicator - dev-perl/Carp-Always - dev-perl/libxml-perl - dev-perl/Glib-Object-Introspection - dev-perl/GooCanvas2 - dev-perl/GooCanvas2-CairoTypes - dev-perl/Gtk3 - dev-perl/Gtk3-ImageView - dev-perl/File-DesktopEntry - dev-perl/File-HomeDir - dev-perl/File-Which - dev-perl/JSON - dev-perl/File-Copy-Recursive - dev-perl/File-MimeInfo - dev-perl/Locale-gettext - dev-perl/Moo - dev-perl/Net-DBus - dev-perl/Number-Bytes-Human - dev-perl/Pango - dev-perl/Proc-Simple - dev-perl/Proc-ProcessTable - dev-perl/Sort-Naturally - dev-perl/X11-Protocol - dev-perl/XML-Simple - virtual/imagemagick-tools[perl] - x11-libs/libwnck:3[introspection] -" -BDEPEND=" - sys-devel/gettext - test? ( dev-perl/Test-MockModule ) -" - -src_prepare() { - hprefixify bin/shutter - default -} - -src_test() { - prove -I share/shutter/resources/modules/ -I t/lib t -r || die -} - -src_install() { - dobin bin/shutter - dodoc README - domenu share/applications/shutter.desktop - doicon share/pixmaps/shutter.png - doman share/man/man1/shutter.1 - - insinto /usr/share - doins -r share/shutter - doins -r share/locale - doins -r share/icons - - insinto /usr/share/metainfo - doins share/metainfo/shutter.metainfo.xml - - # .po doesn't belong to installed system, only .mo - rm -r "${ED}"/usr/share/shutter/resources/po || die - - # shutter executes perl scripts as standalone scripts, and after that "require"s them. - find "${ED}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod +x {} + \ - || die "failed to make plugins executables" - find "${ED}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \ - -name "*.pm" -exec chmod +x {} + || die "failed to make upload plugins executables" -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "writing Exif information" media-libs/exiftool - optfeature "image hostings uploading" "dev-perl/JSON-MaybeXS dev-perl/Path-Class" -} diff --git a/x11-misc/synergy/synergy-1.14.1.32.ebuild b/x11-misc/synergy/synergy-1.14.1.32.ebuild index f12853d6d34b..42315613f3b0 100644 --- a/x11-misc/synergy/synergy-1.14.1.32.ebuild +++ b/x11-misc/synergy/synergy-1.14.1.32.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,7 @@ S=${WORKDIR}/${MY_P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="gui test" RESTRICT="!test? ( test )" diff --git a/x11-misc/trayer-srg/files/trayer-srg-1.1.8-fix-define.patch b/x11-misc/trayer-srg/files/trayer-srg-1.1.8-fix-define.patch new file mode 100644 index 000000000000..a58b4e9acc52 --- /dev/null +++ b/x11-misc/trayer-srg/files/trayer-srg-1.1.8-fix-define.patch @@ -0,0 +1,13 @@ +Add missing argument in function declaration, C23 +https://bugs.gentoo.org/944020 +--- a/bg.h ++++ b/bg.h +@@ -9,7 +9,7 @@ + #include <glib.h> + #include <gdk-pixbuf/gdk-pixbuf.h> + +-void bg_init(); ++void bg_init(Display *dpyn); + void bg_rootbg_changed(); + GdkPixmap *bg_new_for_win(Window win); + void modify_drawable(GdkDrawable *base, GdkGC *gc, guint32 tintcolor, gint alpha); diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild deleted file mode 100644 index 857f7def615b..000000000000 --- a/x11-misc/trayer-srg/trayer-srg-1.1.8-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="trayer fork with multi monitor support and cleaned up codebase" -HOMEPAGE="https://github.com/sargon/trayer-srg" -SRC_URI="https://github.com/sargon/${PN}/archive/${P/-srg/}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND=" - x11-libs/gdk-pixbuf:2 - dev-libs/glib:2 - x11-libs/gtk+:2 - x11-libs/libX11 -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}"/${PN}-trayer-${PV} - -src_configure() { - ./configure --prefix="${EPREFIX}" || die -} - -src_compile() { - emake TARGET=${PN} CC="$(tc-getCC)" -} - -src_install() { - dobin ${PN} - einstalldocs -} diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild index 2676ed677f88..3a334d5db670 100644 --- a/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild +++ b/x11-misc/trayer-srg/trayer-srg-1.1.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-avoid-prestripping-of-files.patch" ) +PATCHES=( + "${FILESDIR}/${P}-avoid-prestripping-of-files.patch" + "${FILESDIR}/${P}-fix-define.patch" +) src_configure() { ./configure --prefix="${EPREFIX}" || die diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest index d68a68892482..cecdf5515c57 100644 --- a/x11-misc/util-macros/Manifest +++ b/x11-misc/util-macros/Manifest @@ -1,2 +1 @@ -DIST util-macros-1.20.1.tar.xz 83124 BLAKE2B f80f6dd5823bd4264b4a6d50cb01cb0fca739a4d9c164d45fa5f9367f9ab7f6181c654859a3dcbea1e666ce12a1402b984eb028b47d71ce6c7b9bc95ce61474e SHA512 5f44d73c18ff87459cd94a68a961465b3970a36f0b55be65c0ec228320a675561eb24a1b1359745124302446a1a3fadc2f50d3378f439df5bd3e866cb8015286 DIST util-macros-1.20.2.tar.xz 83592 BLAKE2B e1e0b78248ecf889aa8d0bad2e98ad26377ab7d559b4b7f82a63be53052b615983220ce6fac18c44ee26d550a650795672d0b0a4d545cf77174bfeb7d7314c83 SHA512 7d5ae8dbb6c1977e40c024f63d1405e7d5a40a38b90b01208d8dc1f1548e309734d1dec177b68bbf342a4d7d56ab0cfb4c8c36575c6a774b5a76a88d926c6d7b diff --git a/x11-misc/util-macros/util-macros-1.20.1.ebuild b/x11-misc/util-macros/util-macros-1.20.1.ebuild deleted file mode 100644 index a22cab1e4e52..000000000000 --- a/x11-misc/util-macros/util-macros-1.20.1.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="X.Org autotools utility macros" -HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros" -SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0" -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" - -# there is nothing to compile for this package, all its contents are produced by -# configure. the only make job that matters is make install -src_compile() { :; } diff --git a/x11-misc/util-macros/util-macros-1.20.2.ebuild b/x11-misc/util-macros/util-macros-1.20.2.ebuild index 0c4fec863e9d..a22cab1e4e52 100644 --- a/x11-misc/util-macros/util-macros-1.20.2.ebuild +++ b/x11-misc/util-macros/util-macros-1.20.2.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.xz" LICENSE="MIT" SLOT="0" -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" # there is nothing to compile for this package, all its contents are produced by # configure. the only make job that matters is make install diff --git a/x11-misc/viewglob/files/viewglob-2.0.4-C23.patch b/x11-misc/viewglob/files/viewglob-2.0.4-C23.patch new file mode 100644 index 000000000000..160a0e069162 --- /dev/null +++ b/x11-misc/viewglob/files/viewglob-2.0.4-C23.patch @@ -0,0 +1,56 @@ +https://bugs.gentoo.org/944019 +https://bugs.gentoo.org/921573 +Fix implicit defines in configure by defaulting to GNU_SOURCES, set include +ordering straight for implicit define in code and fix sizes/declarations +for C23 +--- a/configure.ac ++++ b/configure.ac +@@ -1,6 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + AC_INIT([viewglob], [2.0.4]) + AM_INIT_AUTOMAKE ++AC_USE_SYSTEM_EXTENSIONS + AM_CONFIG_HEADER([config.h]) + RELEASE_DATE="April 26, 2006" + +--- a/common/conf-to-args.c ++++ b/common/conf-to-args.c +@@ -32,7 +32,7 @@ + GString* arg_str = NULL; + + gchar buf[1024]; +- gint nread; ++ gssize nread; + + gchar* home = getenv("HOME"); + if (!home) { +--- a/vgd/tcp-listen.c ++++ b/vgd/tcp-listen.c +@@ -26,6 +26,8 @@ + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#include "common.h" ++ + #include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> +@@ -34,7 +36,6 @@ + + #include <string.h> + +-#include "common.h" + #include "tcp-listen.h" + + +--- a/vgseer/ptytty.c ++++ b/vgseer/ptytty.c +@@ -112,7 +112,7 @@ + #if defined(HAVE_GRANTPT) && defined(HAVE_UNLOCKPT) + # if defined(PTYS_ARE_GETPT) || defined(PTYS_ARE_PTMX) + { +- extern char *ptsname(); ++ extern char *ptsname(int fd); + + # ifdef PTYS_ARE_GETPT + pfd = getpt(); diff --git a/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild index 5e6a315f0954..a130b2f633c8 100644 --- a/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild +++ b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools readme.gentoo-r1 DESCRIPTION="Graphical display of directories and globs referenced at the shell prompt" -HOMEPAGE="http://viewglob.sourceforge.net/" +HOMEPAGE="https://viewglob.sourceforge.net/" SRC_URI="https://downloads.sourceforge.net/viewglob/${P}.tar.gz" LICENSE="GPL-2" @@ -23,6 +23,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${P}-underlinking.patch "${FILESDIR}"/${P}-format-security.patch + "${FILESDIR}"/${P}-C23.patch ) src_prepare() { diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest index b5d6fefcf076..4851d867029c 100644 --- a/x11-misc/virtualgl/Manifest +++ b/x11-misc/virtualgl/Manifest @@ -1,3 +1,2 @@ -DIST VirtualGL-3.0.2.tar.gz 1220143 BLAKE2B 72c6f46ee4c10c81516c9c3cfea610875375376050e266df3019fdfcc6426d10355292ce96cb0821e3934a8017daa8ab9a183049d714aa61c1e54a1b503527f4 SHA512 fe649460265def2858dde76fc9ad0c9183bc5ccf97da2689c43d7157d0a187f0fab784efb2ae17dbface4e7973a300e4b82f8bb7d563e80b67c3199b86068f37 DIST VirtualGL-3.1.1.tar.gz 1223341 BLAKE2B d82a3b8afddc165d4a99b281593662c7584b2d0060e1332bbb1dd621dc1098d4eb1e9c7b3d9a989fa08e89dfafe0001bff905c90aaefb0e0b7532e233a21e0e4 SHA512 40007910dce4ba1aa6bb00fc1e57af8e9d6a77a5a6c795d8f13c9883abc44787871a0bede8621de2fb042585f471281ba9e8bbd16d81c4049ddca8539f535e7e -DIST VirtualGL-3.1.tar.gz 1248818 BLAKE2B 556e2a05811b89ddfecc371d75888f09c7a59bb2c7e3f265eae4631627cf3e586114735b2616cd6292fbcea089e81326736013a7b1d47ad1746365e72e313627 SHA512 cd1109b4dee426918e61348b22b3bfb0c45102bbb0bcde9b78c36b607a396bbff7d7c72cf3bf9626128da0f1776c42bbb59be863239e60e0f7307d2a73de463b +DIST VirtualGL-3.1.2.tar.gz 1224655 BLAKE2B 92a971eed54d5b184eeee2302fee90ae86443291c5b246152f522d8ab92db86d3c6be258b4ce5a2e8fa05b639f9b9b91f6fd0920213103510b3a821a6629d7d7 SHA512 5f51691d66645cfca74997b36c442daf4d3fd54ab93b48e501a275a0e8fcc4ecaa71e24665619d40c5561c9598a8d3c224fb3b7ecd3afb56fe0a6ecc350aec5e diff --git a/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch b/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch deleted file mode 100644 index 5e7153c3c383..000000000000 --- a/x11-misc/virtualgl/files/virtualgl-3.1-drop-register.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/VirtualGL/virtualgl/pull/233 -From: Brahmajit Das <brahmajit.xyz@gmail.com> -Date: Thu, 1 Jun 2023 14:45:17 +0530 -Subject: [PATCH] Dropping use of register keyword - -The usage of register keyword was deprecated in c++14 and it's -completely removed in c++17. Found will building virtualgl on gentoo -with clang-16. - -Bug: https://bugs.gentoo.org/898876 -Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com> ---- a/server/fltk/src/Fl_Text_Buffer.cxx -+++ b/server/fltk/src/Fl_Text_Buffer.cxx -@@ -1286,7 +1286,7 @@ int Fl_Text_Buffer::substitute_null_characters( char *string, int len ) { - ** routine if no substitution has been done. - */ - void Fl_Text_Buffer::unsubstitute_null_characters( char *string ) { -- register char * c, subsChar = mNullSubsChar; -+ char * c, subsChar = mNullSubsChar; - - if ( subsChar == '\0' ) - return; ---- a/server/fltk/src/Fl_arg.cxx -+++ b/server/fltk/src/Fl_arg.cxx -@@ -314,7 +314,7 @@ without express or implied warranty. - - static int ReadInteger(char* string, char** NextString) - { -- register int Result = 0; -+ int Result = 0; - int Sign = 1; - - if (*string == '+') -@@ -337,7 +337,7 @@ int XParseGeometry(const char* string, int* x, int* y, - unsigned int* width, unsigned int* height) - { - int mask = NoValue; -- register char *strind; -+ char *strind; - unsigned int tempWidth = 0, tempHeight = 0; - int tempX = 0, tempY = 0; - char *nextCharacter; ---- a/util/md5.c -+++ b/util/md5.c -@@ -193,7 +193,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx) - */ - void MD5Transform(uint32 buf[4], uint32 in[16]) - { -- register uint32 a, b, c, d; -+ uint32 a, b, c, d; - - a = buf[0]; - b = buf[1]; diff --git a/x11-misc/virtualgl/virtualgl-3.0.2.ebuild b/x11-misc/virtualgl/virtualgl-3.0.2.ebuild deleted file mode 100644 index 27cb5efb4750..000000000000 --- a/x11-misc/virtualgl/virtualgl-3.0.2.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib flag-o-matic systemd - -if [[ ${PV} == *9999 ]] ; then - EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git" - inherit git-r3 -else - MY_PN="VirtualGL" - MY_P="${MY_PN}-${PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${MY_P}.tar.gz" - KEYWORDS="amd64 x86" -fi - -DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" -HOMEPAGE="https://www.virtualgl.org/" - -SLOT="0" -LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" -IUSE="ssl" - -RDEPEND=" - ssl? ( - dev-libs/openssl:0=[${MULTILIB_USEDEP}] - ) - media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] - x11-libs/libX11[${MULTILIB_USEDEP}] - x11-libs/libXext[${MULTILIB_USEDEP}] - x11-libs/libXtst[${MULTILIB_USEDEP}] - x11-libs/libXv[${MULTILIB_USEDEP}] - x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}] - virtual/glu[${MULTILIB_USEDEP}] - virtual/opencl[${MULTILIB_USEDEP}] - virtual/opengl[${MULTILIB_USEDEP}] - amd64? ( abi_x86_32? ( - >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXtst-1.2.3[abi_x86_32] - >=x11-libs/libXv-1.0.10[abi_x86_32] - x11-libs/xcb-util-keysyms[abi_x86_32] - >=virtual/glu-9.0-r1[abi_x86_32] - virtual/opencl[abi_x86_32] - >=virtual/opengl-7.0-r1[abi_x86_32] - ) ) -" -DEPEND="${RDEPEND}" - -src_prepare() { - # Use /var/lib, bug #428122 - sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \ - server/vglrun.in server/vglgenkey server/vglserver_config || die - - cmake_src_prepare -} - -src_configure() { - # Completely breaks steam/wine for discrete graphics otherwise - # see https://github.com/VirtualGL/virtualgl/issues/16 - append-ldflags "-Wl,--no-as-needed" - - abi_configure() { - local mycmakeargs=( - -DVGL_USESSL="$(usex ssl)" - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}" - -DTJPEG_INCLUDE_DIR=/usr/include - -DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)/VirtualGL - -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so - -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) - ) - cmake_src_configure - } - multilib_parallel_foreach_abi abi_configure -} - -src_install() { - cmake-multilib_src_install - - # Make config dir - keepdir /var/lib/VirtualGL - fowners root:video /var/lib/VirtualGL - fperms 0750 /var/lib/VirtualGL - newinitd "${FILESDIR}/vgl.initd-r4" vgl - newconfd "${FILESDIR}/vgl.confd-r2" vgl - - exeinto /usr/libexec - doexe "${FILESDIR}/vgl-helper.sh" - systemd_dounit "${FILESDIR}/vgl.service" - - # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs - # and eglinfo to veglinto because of conflict with mesa-progs[egl] - mv "${D}"/usr/bin/{,v}glxinfo || die - mv "${D}"/usr/bin/{,v}eglinfo || die - - # Remove license files, bug 536284 - rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die -} diff --git a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-3.1.2.ebuild index 5e5505059f3f..1b1bb38f63a8 100644 --- a/x11-misc/virtualgl/virtualgl-3.1-r1.ebuild +++ b/x11-misc/virtualgl/virtualgl-3.1.2.ebuild @@ -12,16 +12,15 @@ else MY_PN="VirtualGL" MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" - SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PV}/${MY_P}.tar.gz" - KEYWORDS="amd64 x86" + SRC_URI="https://github.com/VirtualGL/${PN}/releases/download/${PV}/${MY_P}.tar.gz" + KEYWORDS="~amd64 ~x86" fi DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration" HOMEPAGE="https://www.virtualgl.org/" +LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" SLOT="0" -LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK" -IUSE="" RDEPEND=" media-libs/libjpeg-turbo[${MULTILIB_USEDEP}] @@ -47,10 +46,6 @@ RDEPEND=" " DEPEND="${RDEPEND}" -PATCHES=( - "${FILESDIR}"/${PN}-3.1-drop-register.patch -) - src_prepare() { # Use /var/lib, bug #428122 sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \ diff --git a/x11-misc/xaos/Manifest b/x11-misc/xaos/Manifest index 19d58f601f45..e7f6bbc703ad 100644 --- a/x11-misc/xaos/Manifest +++ b/x11-misc/xaos/Manifest @@ -1,4 +1 @@ -DIST xaos-3.6.tar.gz 2040707 BLAKE2B 7f8bd0e34e6ef81b57d3ac7203f590efb7bea4f6878ff69f0ffe34f2455290381dc01dc4de98efeadfbe02c55671c4d2a0de601a6b8673ced81b72bfb5158548 SHA512 5f61df978b7842b84a52cfb28f7daf1a5ab11d9d7adadbd0dd5bfb60240fcb2fc59b2a3d34faff7896c0c44c32daaf3941071d70db3d58b06b1aef1bcd1022c1 -DIST xaos-4.2.1_p20210828.tar.gz 10918756 BLAKE2B c1431596b503d9b99c880945edae577c493ff4061020052d16dafe79f3abce0b137b789493b103a35d96ac954a47d76aa47d32972feaab0406d2cedc0e685504 SHA512 847315566c72d6b793f32b2c468b0c90e69877d9e9620f1f871e768cfdaf5b156c0d5b568274f3fb89b58ffb74c990108a96a94c21a753965b682adc5e99dbf3 DIST xaos-4.3.3.tar.gz 11083152 BLAKE2B 2fcbeb73806cda6882b60597bf70747e3e70f3e4a3d7c22fda1c0c4c33696b5430f3b1b726ad99d59454d3531e698d7e3911e5844740261861da6aedb8a5347b SHA512 1bfbe929ddb7ac6d5120a5be2e312fe759b0013303a4baa6c11ae29195596025511771e7360ce7cd2e0f27afbaaac9a961327ebfe135997db34db7113eeec7d7 -DIST xaos.png.tar 10240 BLAKE2B 5c925f00d19f6b74ff12c8910fbbfd9d108191d1454be82f8bb0d243001d004f2c10b84d93383bff8214f6192766fb8b4f84435ae129a822d0c2f10accb27f9d SHA512 43d51a07ac8014162b0ff4e9bbefdeeca759d3613816a95149b6fd2397b7c661adcfb33bb45b8de4dedfa41d8799ef7df3eacb426712679e867098eaf144a262 diff --git a/x11-misc/xaos/files/xaos-3.4-include.patch b/x11-misc/xaos/files/xaos-3.4-include.patch deleted file mode 100644 index 3659ccc35a88..000000000000 --- a/x11-misc/xaos/files/xaos-3.4-include.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/src/util/thread.c -+++ b/src/util/thread.c -@@ -1,3 +1,4 @@ -+#include <stdlib.h> - #ifndef _plan9_ - #include <signal.h> - #include <stdio.h> diff --git a/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch b/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch deleted file mode 100644 index 4736dd389b5a..000000000000 --- a/x11-misc/xaos/files/xaos-3.5-build-fix-i686.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xaos-3.5/src/engine/zoomd.c.orig 2009-07-18 00:50:31.000000000 +0100 -+++ xaos-3.5/src/engine/zoomd.c 2012-05-20 19:04:55.891065437 +0100 -@@ -280,6 +280,7 @@ dosymetry2(void /*@unused@ */ *data, str - #endif - #undef bpp1 - -+REGISTERS(0) - static INLINE void fillline(int line) - { - register unsigned char *RESTRICT vbuff = cimage.currlines[line]; ---- xaos-3.5/src/engine/zoom.c.fix-build 2009-07-18 00:50:31.000000000 +0100 -+++ xaos-3.5/src/engine/zoom.c 2012-05-20 19:11:53.625083113 +0100 -@@ -933,6 +933,7 @@ static /*INLINE */ void preparemoveoldpo - } - - #ifndef USE_i386ASM -+REGISTERS(0) - static /*INLINE */ void - moveoldpoints(void /*@unused@ */ *data1, - struct taskinfo /*@unused@ */ *task, diff --git a/x11-misc/xaos/files/xaos-3.6-buildsystem.patch b/x11-misc/xaos/files/xaos-3.6-buildsystem.patch deleted file mode 100644 index 6cdb38ce6405..000000000000 --- a/x11-misc/xaos/files/xaos-3.6-buildsystem.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -11,7 +11,6 @@ - - AC_PROG_CC - AX_COMPILER_VENDOR --AX_CC_MAXOPT - - dnl - dnl GNU gettext related things -@@ -86,7 +85,7 @@ - AC_ARG_WITH(png, - [ --with-png=yes/no enables/disables PNG saving support],[ - if test x$withval = xyes; then -- png=test -+ png=yes - fi - if test x$withval = xno; then - png=no -@@ -141,7 +140,7 @@ - dnl Checks for programs. - - DRIVERDIRS="" --LOCALEDIR="/usr/share/locale" -+LOCALEDIR="$prefix/share/locale" - DRIVERLIBS="lib/libui.a lib/libui-hlp.a lib/libengine.a lib/libutil.a lib/libfilter.a" - AC_PROG_INSTALL - -@@ -422,7 +421,7 @@ - AC_SUBST(REALTOPDIR) - BINPATH="$REALTOPDIR/bin" - AC_SUBST(BINPATH) --AR="ar" -+AC_CHECK_TOOL([AR], [ar]) - AC_SUBST(AR) - SRCPATH="$REALTOPDIR/src" - AC_SUBST(SRCPATH) -@@ -450,7 +449,7 @@ - echo "using GSL for complex numbers" - GSL_LIBS=`$GSL_CONFIG --libs` - GSL_CFLAGS=`$GSL_CONFIG --cflags` -- CFLAGS="$CFLAGS $GSL_CFLAGS -fomit-frame-pointer -DSFFE_USING -DSFFE_CMPLX_GSL" -+ CFLAGS="$CFLAGS $GSL_CFLAGS -DSFFE_USING -DSFFE_CMPLX_GSL" - DRIVERLIBS="$DRIVERLIBS lib/libsffe.a" - ASM_CMPLX_O="" - fi -@@ -473,8 +472,6 @@ - fi - fi - echo "------------------------------------------------------------" --else -- CFLAGS="$CFLAGS -fomit-frame-pointer" - fi - - ---- a/Makefile.in -+++ b/Makefile.in -@@ -36,7 +36,7 @@ - @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help - @INSTALL@ -d $(DESTDIR)$(bindir) - @INSTALL@ -d $(DESTDIR)$(mandir)/man6 -- @INSTALL@ -s bin/xaos $(DESTDIR)$(bindir) -+ @INSTALL@ bin/xaos $(DESTDIR)$(bindir) - @INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial - - @INSTALL@ -m 444 examples/README $(DESTDIR)$(datadir)/XaoS/examples -@@ -49,7 +49,7 @@ - - @INSTALL@ -m 444 catalogs/*.cat catalogs/README $(DESTDIR)$(datadir)/XaoS/catalogs - @INSTALL@ -m 444 help/xaos.hlp $(DESTDIR)$(datadir)/XaoS/help -- @INSTALL@ -m 444 AUTHORS NEWS COPYING TODO INSTALL ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc -+ @INSTALL@ -m 444 AUTHORS NEWS TODO ChangeLog ChangeLog.old $(DESTDIR)$(datadir)/XaoS/doc - @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6 - test -z "$(infodir)" || @INSTALL@ -d "$(DESTDIR)$(infodir)" - @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)/xaos.info ---- a/src/ui/ui-drv/gtk/Makefile.in -+++ b/src/ui/ui-drv/gtk/Makefile.in -@@ -2,7 +2,7 @@ - CFLAGS = @CFLAGS@ - LIBS = @LIBS@ -lm - LFLAGS = @LDFLAGS@ --#AR = @AR@ -+AR = @AR@ - RANLIB = @RANLIB@ - - SRCS = ui_gtk.c diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild deleted file mode 100644 index c0f0a8423529..000000000000 --- a/x11-misc/xaos/xaos-3.6.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop strip-linguas - -DESCRIPTION="Very fast real-time fractal zoomer" -HOMEPAGE="http://matek.hu/xaos/doku.php" -SRC_URI=" - https://downloads.sourceforge.net/${PN}/${P}.tar.gz - https://dev.gentoo.org/~jlec/distfiles/${PN}.png.tar" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="aalib doc gtk nls png svga threads X" - -RDEPEND=" - sci-libs/gsl:= - sys-libs/zlib - aalib? ( media-libs/aalib ) - gtk? ( x11-libs/gtk+:2 ) - png? ( media-libs/libpng:0= ) - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - )" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto )" -BDEPEND=" - virtual/pkgconfig - doc? ( virtual/texi2dvi ) - nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.6-buildsystem.patch - "${FILESDIR}"/${PN}-3.4-include.patch - "${FILESDIR}"/${PN}-3.5-build-fix-i686.patch -) - -src_prepare() { - default - mv configure.{in,ac} || die - eautoreconf - - if use nls; then - if [[ ${LINGUAS+set} == set ]]; then - strip-linguas -i src/i18n - sed -i -e '/^ALL_LINGUAS=/d' configure || die - export ALL_LINGUAS="${LINGUAS}" - fi - else - sed -i -e '/^ALL_LINGUAS=/d' configure || die - fi -} - -src_configure() { - econf \ - --with-sffe=yes \ - --with-gsl=yes \ - $(use_enable nls) \ - $(use_with png) \ - $(use_with aalib aa-driver) \ - $(use_with gtk gtk-driver) \ - $(use_with threads pthread) \ - $(use_with X x11-driver) \ - $(use_with X x) -} - -src_compile() { - default - - if use doc; then - emake -C doc xaos.dvi - dvipdf doc/xaos.dvi || die - - emake -C help html - rm -r help/rest || die - HTML_DOCS=( help/. ) - fi -} - -src_install() { - default - use doc && dodoc xaos.pdf - - make_desktop_entry "xaos -driver $(usex gtk '"GTK+ Driver"' x11)" "XaoS Fractal Zoomer" \ - xaos "Education;Math;Graphics;" - doicon "${WORKDIR}"/${PN}.png -} diff --git a/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild b/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild deleted file mode 100644 index 7f63476c20d0..000000000000 --- a/x11-misc/xaos/xaos-4.2.1_p20210828.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -VIRTUALX_REQUIRED="always" -DOCS_BUILDER="doxygen" -DOCS_DEPEND="media-gfx/graphviz" - -inherit docs qmake-utils - -COMMIT="de9e4f16849c5388760ba3a2e3b0955c5a39b71a" - -DESCRIPTION="Very fast real-time fractal zoomer" -HOMEPAGE="https://xaos-project.github.io/" -SRC_URI="https://github.com/xaos-project/XaoS/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/XaoS-${COMMIT}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtcore:5 -" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools" - -src_configure() { - # install into /usr/ instead of /usr/local - sed -i -e "s:PREFIX = /usr/local:PREFIX = /usr:g" XaoS.pro || die - eqmake5 - # Don't strip, this requires running X/wayland session - sed -i -e '/$(STRIP) $(TARGET)/d' Makefile || die - # Fix INSTALL_ROOT ignored for examples dir - sed -i -e "s:cp {} /usr/share/XaoS/examples:cp {} \${INSTALL_ROOT}/usr/share/XaoS/examples:g" Makefile || die -} - -src_compile() { - default - docs_compile -} - -src_install() { - INSTALL_ROOT="${ED}" default -} diff --git a/x11-misc/xaos/xaos-4.3.3.ebuild b/x11-misc/xaos/xaos-4.3.3.ebuild index 3d24bbaf29d9..f9c154858345 100644 --- a/x11-misc/xaos/xaos-4.3.3.ebuild +++ b/x11-misc/xaos/xaos-4.3.3.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 @@ S="${WORKDIR}/XaoS-release-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux" RDEPEND="dev-qt/qtbase:6[gui,widgets]" DEPEND="${RDEPEND}" diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild index c19674962174..1e5ff6169e47 100644 --- a/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild +++ b/x11-misc/xbitmaps/xbitmaps-1.1.3.ebuild @@ -4,7 +4,6 @@ EAPI=8 XORG_MODULE=data/ -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X.Org bitmaps data" diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest index a05d0e825498..3ba903a523dd 100644 --- a/x11-misc/xcompmgr/Manifest +++ b/x11-misc/xcompmgr/Manifest @@ -1,2 +1 @@ DIST xcompmgr-1.1.10.tar.xz 133224 BLAKE2B 277f81cde9ae6a79b81e58754c4dc7baeec5b7e6b47abae044a13be5973b4c30968e7961720e831ad86e0a2b1d282d8529a607a2e510c7090658a1b288cf315b SHA512 6dd5c72d6859489580dabdb96e3b572931cec7c426022213007c92df2d805a8f01a7f3dc5e8493f6e550bb809f71a50ca1630f50555d47b8d5b4b2726d7b8b12 -DIST xcompmgr-1.1.9.tar.xz 132676 BLAKE2B ece3717d582df62dcaaabb347d07ffda373f9660a74688b9637ea824eb9ac32003bddf323d9b1478f3abdf51b68005abb4c024720a75689d1ed70b45a8e026c2 SHA512 699117492af7fd84b36d317dcbf422d5ec86a7f21e29370caa737cd940d8ff866a5c8704ba2e7bd17a64e085d77fd23b628263d619813dead85cd669ff5b860e diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild index 7b2bb795adf3..33b2bf7bd238 100644 --- a/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild +++ b/x11-misc/xcompmgr/xcompmgr-1.1.10.ebuild @@ -4,13 +4,12 @@ EAPI=8 XORG_MODULE=app/ -XORG_TARBALL_SUFFIX="xz" inherit xorg-3 DESCRIPTION="X Compositing manager" LICENSE="HPND" -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86" RDEPEND=" x11-libs/libXrender diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.9.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.9.ebuild deleted file mode 100644 index 81c0ec91dde4..000000000000 --- a/x11-misc/xcompmgr/xcompmgr-1.1.9.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -XORG_MODULE=app/ -XORG_TARBALL_SUFFIX="xz" -inherit xorg-3 - -DESCRIPTION="X Compositing manager" - -LICENSE="BSD" -KEYWORDS="amd64 ~arm64 ppc ppc64 sparc x86" - -RDEPEND=" - x11-libs/libXrender - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXcomposite - x11-libs/libXext -" -DEPEND="${RDEPEND} - x11-base/xorg-proto" diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest index b5b48378a036..7bfba1fec79c 100644 --- a/x11-misc/xdg-user-dirs-gtk/Manifest +++ b/x11-misc/xdg-user-dirs-gtk/Manifest @@ -1 +1,2 @@ DIST xdg-user-dirs-gtk-0.11.tar.xz 126488 BLAKE2B 45b8c3ab0b43214a1c1b39d368a283fb566bee115549468eb85e1e9e5407025690dbe320698df107523a3ea0d7cd8d0d3ef8d2296c80c79a74863d50eb581581 SHA512 2a650c6372126f807ac90fb0508e1b11636b38b5960a3037b547e9f1bb1a6b82653f20da7d5aae1144eebec040e3af89a02fbf70c1768724019b384f6d9cf85a +DIST xdg-user-dirs-gtk-0.14.tar.xz 49564 BLAKE2B 9a7bd40c9e063b05dc4bdd401f79b7d473c6165b894ce84d86ba73ba70333de041b1bdb0bd59040b94f6993eb0d607673e6cef946b6d21e8731611a124f9436e SHA512 37c255650d57dc6f3dddb1cea592891ec0f883f63a6e01e6c2339bf325ca1aa35a59c5502fd1c8edb6abb569f12ac9e19f8de5f639779dae0e5ebc42ef9aade1 diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.14.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.14.ebuild new file mode 100644 index 000000000000..c272679daeeb --- /dev/null +++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.14.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org meson readme.gentoo-r1 + +DESCRIPTION="Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications" +HOMEPAGE="https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + +RDEPEND=" + dev-libs/glib:2 + >=x11-libs/gtk+-3.5.1:3 + >=x11-misc/xdg-user-dirs-0.14 +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" + +DOC_CONTENTS=" + This package tries to automatically use some sensible default + directories for your documents, music, video, and other stuff. + If you want to change those directories to your needs, see + the settings in ~/.config/user-dirs.dirs +" + +src_prepare() { + default + sed -i \ + -e '/Encoding/d' \ + -e 's:OnlyShowIn=GNOME;LXDE;Unity;:NotShowIn=KDE;:' \ + user-dirs-update-gtk.desktop.in || die +} + +src_install() { + meson_src_install + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r8.ebuild index fc0c96334ecd..87f50b61f5c2 100644 --- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r6.ebuild +++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r8.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 @@ -19,11 +19,11 @@ fi LICENSE="MIT" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="dbus doc gnome plasma X" +IUSE="dbus doc gnome perl plasma X" REQUIRED_USE="gnome? ( dbus )" +# dev-perl/File-MimeInfo: mimeopen used by xdg-open RDEPEND=" - dev-perl/File-MimeInfo dev-util/desktop-file-utils x11-misc/shared-mime-info dbus? ( @@ -33,6 +33,7 @@ RDEPEND=" dev-perl/X11-Protocol ) ) + perl? ( dev-perl/File-MimeInfo ) plasma? ( virtual/pkgconfig ) @@ -43,6 +44,7 @@ RDEPEND=" " PDEPEND=" plasma? ( + kde-plasma/kde-cli-tools:* || ( ( kde-frameworks/kservice:6 diff --git a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild b/x11-misc/xdiskusage/xdiskusage-1.52-r1.ebuild index deb5d693b990..2d797dfa7f0d 100644 --- a/x11-misc/xdiskusage/xdiskusage-1.52.ebuild +++ b/x11-misc/xdiskusage/xdiskusage-1.52-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="amd64 ~arm64 ~ppc x86" -RDEPEND=">=x11-libs/fltk-1.3:1" +RDEPEND="x11-libs/fltk:1=" BDEPEND="${RDEPEND}" DEPEND="${RDEPEND}" diff --git a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild index eadd29f568db..7e1a5fdb0926 100644 --- a/x11-misc/xdotool/xdotool-3.20211022.1.ebuild +++ b/x11-misc/xdotool/xdotool-3.20211022.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86" IUSE="examples" # Many the tests want to manually start Xvfb regardless of whether there diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index bb20b6e18e13..dab55d564e60 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1 +1,2 @@ DIST xkeyboard-config-2.43.tar.xz 925424 BLAKE2B 89cf4872305ce3358185ed63f0ff2f0dc90205d50d51b4b881256e0762b12a74f30d0905a75e5feff2f0fef09d94bee778a8cbe83cdf6e048653e8eb42f53087 SHA512 6daf885bf8794cf03d5b447b90ca1666f87e9c609a344e02bb90edca360eb64b24f80a92ed570aa75b4ea62245b3998f6df3757f7e02c4015cdfecee5378a0d4 +DIST xkeyboard-config-2.44.tar.xz 906060 BLAKE2B 6abb485ef5c9cb1292afaed22ac72026dc22c0a08c3bf04ca29f8dd61d68cbf06e511fe095628a0ab6dec7766374318c4b5bddeb2c4da8a8a692bbbbf4b4e83b SHA512 1bd6c594c132d262863e9911cfe4e70936c82a87c118b302d032cc900767653abd6db3ee5bc8220dafa8cf65aba15e3ceae9cbd88c318dd404d3c432c8ed9c00 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.44.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.44.ebuild new file mode 100644 index 000000000000..4ebef64ae30a --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.44.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} ) +inherit meson python-any-r1 + +DESCRIPTION="X keyboard configuration database" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig/ https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git" + inherit git-r3 +else + SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-lang/perl + dev-libs/libxslt + sys-devel/gettext + ${PYTHON_DEPS} + test? ( + x11-apps/xkbcomp + x11-libs/libxkbcommon + $(python_gen_any_dep ' + dev-python/pycountry[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + ') + ) +" + +python_check_deps() { + use test || return 0 + python_has_version \ + "dev-python/pycountry[${PYTHON_USEDEP}]" \ + "dev-python/pytest-xdist[${PYTHON_USEDEP}]" \ + "dev-python/pytest[${PYTHON_USEDEP}]" +} + +pkg_setup() { + python-any-r1_pkg_setup +} + +src_prepare() { + eapply_user + + # Remove pytest timeout + sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die +} + +src_configure() { + local emesonargs=( + -Dxkb-base="${EPREFIX}/usr/share/X11/xkb" + -Dcompat-rules=true + ) + meson_src_configure +} diff --git a/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch b/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch deleted file mode 100644 index f36e3ab0b7a2..000000000000 --- a/x11-misc/xlockmore/files/xlockmore-5.64_alpha0-LDFLAGS.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/modes/Makefile.in -+++ b/modes/Makefile.in -@@ -344,7 +344,7 @@ - CXXFLAGS = @CXXFLAGS@ - #CFLAGS = -O - #CFLAGS = -g --XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) -+XLOCKLDFLAGS = $(LDFLAGS) @XLOCKLDFLAGS@ $(CHECKLDFLAG) - XLIBS = @XLIBS@ - XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@ - ---- a/xmlock/Makefile.in -+++ b/xmlock/Makefile.in -@@ -94,7 +94,7 @@ - CFLAGS = @CFLAGS@ - #CFLAGS = -O - #CFLAGS = -g --XMLOCKLDFLAGS = @XMLOCKLDFLAGS@ -+XMLOCKLDFLAGS = $(LDFLAGS) @XMLOCKLDFLAGS@ - XLIBS = @XLIBS@ - XMLOCKLIBS = @XMLOCKLIBS@ - #If you have purify, and want to use it, uncomment this definition or ---- a/xglock/Makefile.in -+++ b/xglock/Makefile.in -@@ -92,7 +92,7 @@ - CFLAGS = @GTK_CFLAGS@ @CFLAGS@ - #CFLAGS = -O - #CFLAGS = -g --XGLOCKLDFLAGS = @XGLOCKLDFLAGS@ -+XGLOCKLDFLAGS = $(LDFLAGS) @XGLOCKLDFLAGS@ - XLIBS = @XLIBS@ - XGLOCKLIBS = @XGLOCKLIBS@ - #If you have purify, and want to use it, uncomment this definition or diff --git a/x11-misc/xlockmore/xlockmore-5.71.ebuild b/x11-misc/xlockmore/xlockmore-5.71.ebuild index b774e8bccb86..6eb3c404333e 100644 --- a/x11-misc/xlockmore/xlockmore-5.71.ebuild +++ b/x11-misc/xlockmore/xlockmore-5.71.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -53,7 +53,6 @@ PATCHES=( "${FILESDIR}"/${PN}-5.46-freetype261.patch "${FILESDIR}"/${PN}-5.47-CXX.patch "${FILESDIR}"/${PN}-5.47-strip.patch - #"${FILESDIR}"/${PN}-5.64_alpha0-LDFLAGS.patch "${FILESDIR}"/${PN}-5.71-fix-build-for-clang16.patch ) diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest index 5197d620a901..6818d91ea0a4 100644 --- a/x11-misc/xosview/Manifest +++ b/x11-misc/xosview/Manifest @@ -1 +1,2 @@ DIST xosview-1.23.tar.gz 146299 BLAKE2B ba336ac152ac6c44bd51c84c160d7c1b565fe23c17aa89db36be7325f4f1caa1ab84a1ad386041841a0aacb62208fb5d59f5dd7a9d2bf071c76dff2901eb2c60 SHA512 10a25f644ec3d896071990117c6d80e553a17baf64809f11bc778652dca1498f81c333ac0f21a809ef617d7e6cbe65afaa14d5bc96908958d8f997234e660ba1 +DIST xosview-1.24.tar.gz 141144 BLAKE2B eb93f902d88412768d012d37b0d5063d9e3adbdea088a32c51618fe03743dc61eaa4204d42562efe276eaf5ff0bab8b1b212c5ae26fb12cb7b44ce0fb001abe8 SHA512 aeeecc3be8c4a22bb62062ca51c927ace186c0652f7cc16fbdd7b7d3acb247242d1ad64960cfb4622bd1626fdfcd26ef6938df2b4f788ee8fc44e5cf59396540 diff --git a/x11-misc/xosview/xosview-1.24.ebuild b/x11-misc/xosview/xosview-1.24.ebuild new file mode 100644 index 000000000000..603bd3da5e25 --- /dev/null +++ b/x11-misc/xosview/xosview-1.24.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs xdg-utils + +DESCRIPTION="X11 operating system viewer" +HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/" +SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz" + +LICENSE="GPL-2 BSD" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="suid" + +COMMON_DEPS="x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXt" +RDEPEND="${COMMON_DEPS} + media-fonts/font-misc-misc" +DEPEND="${COMMON_DEPS} + x11-base/xorg-proto" + +DOCS=( CHANGES README.linux TODO ) + +src_prepare() { + default + + sed -i -e 's:lib/X11/app:share/X11/app:g' -i ${PN}.1 || die + sed -i -e "s:Git:${PV}:g" ${PN}.cc || die + tc-export CXX +} + +src_compile() { + emake OPTFLAGS='' +} + +src_install() { + emake PREFIX="${D}/usr" install + use suid && fperms 4755 /usr/bin/${PN} + insinto /usr/share/X11/app-defaults + newins Xdefaults XOsview +} + +pkg_postinst() { + xdg_desktop_database_update + + if ! use suid ; then + ewarn "If you want to use serial meters ${PN} needs to be executed as root." + ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details." + fi +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/x11-misc/xpad/Manifest b/x11-misc/xpad/Manifest index e3461617d1a4..6a3175602e71 100644 --- a/x11-misc/xpad/Manifest +++ b/x11-misc/xpad/Manifest @@ -1,3 +1 @@ -DIST xpad-5.4.0.tar.bz2 163394 BLAKE2B 478e96b6c09748f4643d287887f8432642f42e6786e6473832328f7d1202a1a23d96f2a06859e8da096b0e6c420df06269b6c2459e67cbceb29b9f569d565931 SHA512 a20b1d16d0d9e4cb0b88c969165eb9514b69a0eaef91eca8a3fb4da08ea8a2db32891de3c8a2a4a97db21bf78f515c7b6f798c59ba155f480f866334fca7986f -DIST xpad-5.7.0.tar.bz2 162675 BLAKE2B 2166816696d2e00a261fcc8e9483841be7803121dc3669ab35fdd014728f16a47860448dd6b754836a3dfcd0fbbd1805b87e470f96c0b692fbe3a588c81ee35f SHA512 ab9319473cbec9a7022e520e2284853270fccca88ad19e8cb52024ce79a2dd8049251009a22b97e2387de12b9e75576e50d4d17a7236cb8e0eb4c840c3400ef3 DIST xpad-5.8.0.tar.bz2 162732 BLAKE2B 6165e59b2d05e640f820f1f52811f214909f445adee4bfeb595fc3913493d15f4a25556b5edb006163a0c123b9953934c77cb519d0dd9f567170a0282637b43a SHA512 868dc820a172fc31f79fab5ee842e4f7e5646ae0239101bb442fc9a4a79b2c76052a70b635a9fa39fae22838df698a4a398188bc44dada63db16a756330c3cbd diff --git a/x11-misc/xpad/files/xpad-5.8.0-gettext.patch b/x11-misc/xpad/files/xpad-5.8.0-gettext.patch new file mode 100644 index 000000000000..e923b8a6ddc1 --- /dev/null +++ b/x11-misc/xpad/files/xpad-5.8.0-gettext.patch @@ -0,0 +1,16 @@ +Require specific gettext version, as otherwise using +>=sys-devel/gettext-0.23 may lead to a build error due +to misaligned gettext versions. +https://bugs.gentoo.org/945976 + +--- a/configure.ac ++++ b/configure.ac +@@ -52,7 +52,7 @@ AC_TYPE_SIZE_T + # i18n / text translations + # The choice for version of gettext is only based on what was installed on the developers desktop (2021). + # If another version is more convenient, go for it. +-AM_GNU_GETTEXT_VERSION([0.21]) ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.21]) + AM_GNU_GETTEXT([external]) + + GETTEXT_PACKAGE="$PACKAGE" diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild deleted file mode 100644 index cf0357f56a9e..000000000000 --- a/x11-misc/xpad/xpad-5.4.0.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools - -DESCRIPTION="A sticky note application for GTK" -HOMEPAGE="https://launchpad.net/xpad" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" - -RDEPEND=" - >=dev-libs/glib-2.56:2 - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) - sys-devel/gettext - x11-libs/gdk-pixbuf - x11-libs/gtk+:3[X] - x11-libs/gtksourceview:3.0 - x11-libs/libICE - x11-libs/libSM - x11-libs/pango -" -DEPEND=" - ${RDEPEND} - >=dev-util/intltool-0.31 - sys-devel/gettext - virtual/pkgconfig -" - -src_prepare() { - default - - eautoreconf -} diff --git a/x11-misc/xpad/xpad-5.7.0.ebuild b/x11-misc/xpad/xpad-5.7.0.ebuild deleted file mode 100644 index 90ae5daec211..000000000000 --- a/x11-misc/xpad/xpad-5.7.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools xdg-utils - -DESCRIPTION="A sticky note application for GTK" -HOMEPAGE="https://launchpad.net/xpad" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm ppc x86" - -RDEPEND=" - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) - >=dev-libs/glib-2.58:2 - x11-libs/gdk-pixbuf - x11-libs/gtk+:3[X] - x11-libs/gtksourceview:4 - x11-libs/libICE - x11-libs/libSM - x11-libs/pango -" -DEPEND="${RDEPEND}" -BDEPEND=">=dev-util/intltool-0.31 - sys-devel/gettext - virtual/pkgconfig" - -src_prepare() { - default - - eautoreconf -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-misc/xpad/xpad-5.8.0-r1.ebuild b/x11-misc/xpad/xpad-5.8.0-r1.ebuild index 1f09ce2c5800..43dd732081bf 100644 --- a/x11-misc/xpad/xpad-5.8.0-r1.ebuild +++ b/x11-misc/xpad/xpad-5.8.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm x86" +KEYWORDS="amd64 ~arm ~ppc x86" RDEPEND=" >=app-accessibility/at-spi2-core-2.46.0:2 @@ -29,6 +29,8 @@ BDEPEND=">=dev-util/intltool-0.31 sys-devel/gettext virtual/pkgconfig" +PATCHES=("${FILESDIR}"/${PN}-5.8.0-gettext.patch) + src_prepare() { default diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest index 2db8901a2ef2..d9d84053c7cc 100644 --- a/x11-misc/xscreensaver/Manifest +++ b/x11-misc/xscreensaver/Manifest @@ -1,5 +1,3 @@ DIST xscreensaver-6.06-logind-idle-hint.patch 4036 BLAKE2B 48c2766ff5879b77f521d17f08452c84a9c926fabba932a02d02615808f6f2503ed2be4bbfd71f21152ba833c7f4cc0d672cdc219b82729963d6d357c6198682 SHA512 fd9848843c43a5eb07007e5cca21ad1517cce1e3ebecd9d678bb6287b9b7f80eee0751b5789f2ed9fb5e0cefa2430ac9d9657aade724d70c6457cce3df1f6ea3 DIST xscreensaver-6.07-xscreensaver.service-start-with-no-splash.patch 834 BLAKE2B 57c509e370ba79c4197a2a51188e09c2a48cc172f889c8876c0fb1af995b87465ddc390b3e704cb572c29c1537f3d05b065365d6357c51047c910124b7c8f6c4 SHA512 6e7dcfbe0e687719f3f5579790a48544bb8728231cd7ac1c8b82f5814da0be1e67f2308de7f0354a2ba20ac098c2d5ae8c212b9a3a7b84177bc4bb10739378c3 -DIST xscreensaver-6.07.tar.gz 26365057 BLAKE2B b0fc24e34713dd5591cff2ff871ec05deae089d7d76fe1239dd59ec1addf97eb764a583d01685953ae6409a7193ca97bc201a20dcf86d5244cf898e4eb9b1221 SHA512 abbf75faa49bb23d35985a7bf269891d168c87fe8939ad5acf6857398dfb056815d79dcf39bba9a33808e2717a47635fa84282c03ed9efeeeb449763253179a5 -DIST xscreensaver-6.08.tar.gz 19990058 BLAKE2B 1dd13a656471335663738e677dd1b367ab1114ba91e65868ad2a1d8ebe95b16ff0311c2b69a2a5409ebdea68451d5e6cb507a66a5fb641921a469b8e69ec6b2d SHA512 a333d4921ed3a8219f3b672dd68543aea31fcd64ea6766143f1c7f6e5ed3bc7122355635d5afba1632457ad71a11cabdc7b2756431e4f1dc7e0426ae0896e6db DIST xscreensaver-6.09.tar.gz 22026182 BLAKE2B 34e3bf5b3affbfc6ef0aabaf9889c4b76ce27b09974d6c84a9b342b2267a3268fa1558a9bf0e0e487fce84ef218c3152fca4216268e15e40f82fef91021160da SHA512 6002c1879e3f9c509b4f6b645146978da82def0ed7b9e9c421b11dadf0116380c63403c30167fa70a289321928abe39795a96f1a796afb920bd0e3ac416d3653 diff --git a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild deleted file mode 100644 index fa0e6da22cd4..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-6.07-r2.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils - -DESCRIPTION="Modular screen saver and locker for the X Window System" -HOMEPAGE="https://www.jwz.org/xscreensaver/" -SRC_URI=" - https://www.jwz.org/xscreensaver/${P}.tar.gz - logind-idle-hint? ( - https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> - ${PN}-6.06-logind-idle-hint.patch - ) - systemd? ( - https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> - ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch - ) -" - -# Font license mapping for folder ./hacks/fonts/ as following: -# clacon.ttf -- MIT -# gallant12x22.ttf -- unclear, hence dropped -# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) -# OCRAStd.otf -- unclear, hence dropped -# SpecialElite.ttf -- Apache-2.0 -LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" -REQUIRED_USE=" - gles? ( !glx ) - ?? ( elogind systemd ) - pam? ( locking ) - logind-idle-hint? ( || ( elogind systemd ) ) -" - -COMMON_DEPEND=" - >=dev-libs/libxml2-2.4.6 - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - elogind? ( sys-auth/elogind ) - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2 - >=x11-libs/gtk+-3.0.0:3 - jpeg? ( media-libs/libjpeg-turbo:= ) - locking? ( virtual/libcrypt:= ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - virtual/glu - virtual/opengl - pam? ( sys-libs/pam ) - media-libs/libpng:= - systemd? ( >=sys-apps/systemd-221 ) - >=x11-libs/libXft-2.1.0 - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - media-gfx/fbida - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - x11-base/xorg-proto -" -BDEPEND=" - dev-util/intltool - app-alternatives/bc - sys-devel/gettext - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-6.01-gentoo.patch - "${FILESDIR}"/${PN}-6.07-gcc.patch - "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch -# "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch -# "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch - "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch -# "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch - "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch -# "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch -# "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch - "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch - "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch -) - -DOCS=( README{,.hacking} ) - -# see https://bugs.gentoo.org/898328 -QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) - -src_prepare() { - default - - # bug #896440 - mv po/ca.po po/ca.po.old || die - iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die - - sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die - - if use systemd; then - # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." - # after "systemctl --user enable xscreensaver". - sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ - driver/xscreensaver.service.in || die - - eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" - fi - - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.ac} || die - fi - - # We are patching driver/XScreenSaver.ad.in, so let's delete the - # header generated from it so that it gets back in sync during build: - rm driver/XScreenSaver_ad.h || die - - if ! use offensive; then - sed -i \ - -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ - hacks/barcode.c || die - sed -i \ - -e 's|erect penis|shuffle board|g' \ - -e 's|flaccid penis|flaccid anchor|g' \ - -e 's|vagina|engagement ring|g' \ - -e 's|Penis|Shuttle|g' \ - hacks/glx/glsnake.c || die - sed -i \ - 's| Stay.*fucking mask\.$||' \ - hacks/glx/covid19.man \ - hacks/config/covid19.xml || die - eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch" - fi - - if use logind-idle-hint; then - eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch" - fi - - config_rpath_update "${S}"/config.rpath - - # Must be eauto*re*conf, to force the rebuild - eautoreconf -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - - # /proc/interrupts won't always have the keyboard bits needed - # Not clear this does anything in 6.03+(?) but let's keep it for now in case. - # (See also: configure argument) - export ac_cv_have_proc_interrupts=yes - - # WARNING: This is NOT a normal autoconf script - # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" - ECONF_OPTS=( - $(use_enable locking) - $(use_with elogind) - --with-pixbuf - $(use_with gles) - $(use_with glx) - --with-gtk - $(use_with new-login login-manager) - $(use_with pam) - $(use_with suid setuid-hacks) - $(use_with systemd) - $(use_with xinerama xinerama-ext) - --with-jpeg=$(usex jpeg yes no) - --with-png=yes - --with-xft=yes - --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults - --with-configdir="${EPREFIX}"/usr/share/${PN}/config - --with-dpms-ext - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} - --with-proc-interrupts - --with-randr-ext - --with-text-file="${EPREFIX}"/etc/gentoo-release - --with-xdbe-ext - --with-xf86gamma-ext - --with-xf86vmode-ext - --with-xinput-ext - --with-xkb-ext - --with-xshm-ext - --without-gle - --without-kerberos - --without-motif - --with-proc-oom - --x-includes="${EPREFIX}"/usr/include - --x-libraries="${EPREFIX}"/usr/$(get_libdir) - ) - # WARNING: This is NOT a normal autoconf script - econf "${ECONF_OPTS[@]}" -} - -src_compile() { - # stock target is "default", which is broken in some releases. - emake all -} - -src_install() { - use pam && dodir /etc/pam.d/ - emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install - - if use fonts; then - # Do not install fonts with unclear licensing - rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die - - # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) - rm -v "${ED}${FONTDIR}"/luximr.ttf || die - - font_xfont_config - else - rm -rfv "${ED}${FONTDIR}" || die #812473 - fi - - einstalldocs - - if use pam; then - fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - fi - - if use systemd; then - systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" - fi - # Makefile installs xscreensaver.service regardless of - # --without-systemd, and if USE=systemd, we will have installed the - # unit file already. - rm "${ED}/usr/share/${PN}/xscreensaver.service" || die - - # bug #885989 - fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth -} - -pkg_postinst() { - use fonts && font_pkg_postinst - - # bug #811885 - if ! use glx; then - elog "Enable USE='glx' if OpenGL screensavers are crashing." - fi - - optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi - optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi - optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf - - xdg_icon_cache_update -} - -pkg_postrm() { - use fonts && font_pkg_postrm - xdg_icon_cache_update -} diff --git a/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild deleted file mode 100644 index 45f5a50cc9a4..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-6.08-r1.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils - -DESCRIPTION="Modular screen saver and locker for the X Window System" -HOMEPAGE="https://www.jwz.org/xscreensaver/" -SRC_URI=" - https://www.jwz.org/xscreensaver/${P}.tar.gz - logind-idle-hint? ( - https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> - ${PN}-6.06-logind-idle-hint.patch - ) - systemd? ( - https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> - ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch - ) -" - -# Font license mapping for folder ./hacks/fonts/ as following: -# clacon.ttf -- MIT -# gallant12x22.ttf -- unclear, hence dropped -# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) -# OCRAStd.otf -- unclear, hence dropped -# SpecialElite.ttf -- Apache-2.0 -LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" -REQUIRED_USE=" - gles? ( !glx ) - ?? ( elogind systemd ) - pam? ( locking ) - logind-idle-hint? ( || ( elogind systemd ) ) -" - -COMMON_DEPEND=" - >=dev-libs/libxml2-2.4.6 - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - elogind? ( sys-auth/elogind ) - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2 - >=x11-libs/gtk+-3.0.0:3 - jpeg? ( media-libs/libjpeg-turbo:= ) - locking? ( virtual/libcrypt:= ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - virtual/glu - virtual/opengl - pam? ( sys-libs/pam ) - media-libs/libpng:= - systemd? ( >=sys-apps/systemd-221 ) - >=x11-libs/libXft-2.1.0 - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - media-gfx/fbida - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - x11-base/xorg-proto -" -BDEPEND=" - dev-util/intltool - app-alternatives/bc - sys-devel/gettext - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-6.01-gentoo.patch - "${FILESDIR}"/${PN}-6.07-gcc.patch - "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch - "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch - "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch - "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch - "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch - "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch - "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch - "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch - "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch -) - -DOCS=( README{,.hacking} ) - -# see https://bugs.gentoo.org/898328 -QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) - -src_prepare() { - default - - # bug #896440 - mv po/ca.po po/ca.po.old || die - iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die - - sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die - - if use systemd; then - # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." - # after "systemctl --user enable xscreensaver". - sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ - driver/xscreensaver.service.in || die - - eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" - fi - - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.ac} || die - fi - - # We are patching driver/XScreenSaver.ad.in, so let's delete the - # header generated from it so that it gets back in sync during build: - rm driver/XScreenSaver_ad.h || die - - if ! use offensive; then - sed -i \ - -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ - hacks/barcode.c || die - sed -i \ - -e 's|erect penis|shuffle board|g' \ - -e 's|flaccid penis|flaccid anchor|g' \ - -e 's|vagina|engagement ring|g' \ - -e 's|Penis|Shuttle|g' \ - hacks/glx/glsnake.c || die - sed -i \ - 's| Stay.*fucking mask\.$||' \ - hacks/glx/covid19.man \ - hacks/config/covid19.xml || die - eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch" - fi - - if use logind-idle-hint; then - eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch" - fi - - config_rpath_update "${S}"/config.rpath - - # Must be eauto*re*conf, to force the rebuild - eautoreconf -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - - # /proc/interrupts won't always have the keyboard bits needed - # Not clear this does anything in 6.03+(?) but let's keep it for now in case. - # (See also: configure argument) - export ac_cv_have_proc_interrupts=yes - - # WARNING: This is NOT a normal autoconf script - # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" - ECONF_OPTS=( - $(use_enable locking) - $(use_with elogind) - --with-pixbuf - $(use_with gles) - $(use_with glx) - --with-gtk - $(use_with new-login login-manager) - $(use_with pam) - $(use_with suid setuid-hacks) - $(use_with systemd) - $(use_with xinerama xinerama-ext) - --with-jpeg=$(usex jpeg yes no) - --with-png=yes - --with-xft=yes - --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults - --with-configdir="${EPREFIX}"/usr/share/${PN}/config - --with-dpms-ext - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} - --with-proc-interrupts - --with-randr-ext - --with-text-file="${EPREFIX}"/etc/gentoo-release - --with-xdbe-ext - --with-xf86gamma-ext - --with-xf86vmode-ext - --with-xinput-ext - --with-xkb-ext - --with-xshm-ext - --without-gle - --without-kerberos - --without-motif - --with-proc-oom - --x-includes="${EPREFIX}"/usr/include - --x-libraries="${EPREFIX}"/usr/$(get_libdir) - ) - # WARNING: This is NOT a normal autoconf script - econf "${ECONF_OPTS[@]}" -} - -src_compile() { - # stock target is "default", which is broken in some releases. - emake all -} - -src_install() { - use pam && dodir /etc/pam.d/ - emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install - - if use fonts; then - # Do not install fonts with unclear licensing - rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die - - # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) - rm -v "${ED}${FONTDIR}"/luximr.ttf || die - - font_xfont_config - else - rm -rfv "${ED}${FONTDIR}" || die #812473 - fi - - einstalldocs - - if use pam; then - fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - fi - - if use systemd; then - systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" - fi - # Makefile installs xscreensaver.service regardless of - # --without-systemd, and if USE=systemd, we will have installed the - # unit file already. - rm "${ED}/usr/share/${PN}/xscreensaver.service" || die - - # bug #885989 - fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth -} - -pkg_postinst() { - use fonts && font_pkg_postinst - - # bug #811885 - if ! use glx; then - elog "Enable USE='glx' if OpenGL screensavers are crashing." - fi - - optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi - optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi - optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf - - xdg_icon_cache_update -} - -pkg_postrm() { - use fonts && font_pkg_postrm - xdg_icon_cache_update -} diff --git a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild b/x11-misc/xscreensaver/xscreensaver-6.08.ebuild deleted file mode 100644 index fa0e6da22cd4..000000000000 --- a/x11-misc/xscreensaver/xscreensaver-6.08.ebuild +++ /dev/null @@ -1,279 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic font optfeature pam strip-linguas systemd xdg-utils - -DESCRIPTION="Modular screen saver and locker for the X Window System" -HOMEPAGE="https://www.jwz.org/xscreensaver/" -SRC_URI=" - https://www.jwz.org/xscreensaver/${P}.tar.gz - logind-idle-hint? ( - https://github.com/Flowdalic/xscreensaver/commit/59e7974c42dc08411c9af2a3a644a582c2116f46.patch -> - ${PN}-6.06-logind-idle-hint.patch - ) - systemd? ( - https://github.com/Flowdalic/xscreensaver/commit/376b07ec76cfe1070f498773aaec8fd7030593af.patch -> - ${PN}-6.07-xscreensaver.service-start-with-no-splash.patch - ) -" - -# Font license mapping for folder ./hacks/fonts/ as following: -# clacon.ttf -- MIT -# gallant12x22.ttf -- unclear, hence dropped -# luximr.ttf -- bh-luxi (package media-fonts/font-bh-ttf) -# OCRAStd.otf -- unclear, hence dropped -# SpecialElite.ttf -- Apache-2.0 -LICENSE="BSD fonts? ( MIT Apache-2.0 ) systemd? ( ISC )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" -IUSE="elogind fonts gdm gles glx jpeg +locking logind-idle-hint new-login offensive pam +perl selinux suid systemd xinerama" -REQUIRED_USE=" - gles? ( !glx ) - ?? ( elogind systemd ) - pam? ( locking ) - logind-idle-hint? ( || ( elogind systemd ) ) -" - -COMMON_DEPEND=" - >=dev-libs/libxml2-2.4.6 - x11-apps/appres - x11-apps/xwininfo - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXt - x11-libs/libXxf86vm - elogind? ( sys-auth/elogind ) - x11-libs/gdk-pixbuf-xlib - >=x11-libs/gdk-pixbuf-2.42.0:2 - >=x11-libs/gtk+-3.0.0:3 - jpeg? ( media-libs/libjpeg-turbo:= ) - locking? ( virtual/libcrypt:= ) - new-login? ( - gdm? ( gnome-base/gdm ) - !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) - ) - virtual/glu - virtual/opengl - pam? ( sys-libs/pam ) - media-libs/libpng:= - systemd? ( >=sys-apps/systemd-221 ) - >=x11-libs/libXft-2.1.0 - xinerama? ( x11-libs/libXinerama ) -" -# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'` -RDEPEND=" - ${COMMON_DEPEND} - media-gfx/fbida - perl? ( - dev-lang/perl - dev-perl/libwww-perl - virtual/perl-Digest-MD5 - ) - selinux? ( sec-policy/selinux-xscreensaver ) -" -DEPEND=" - ${COMMON_DEPEND} - x11-base/xorg-proto -" -BDEPEND=" - dev-util/intltool - app-alternatives/bc - sys-devel/gettext - virtual/pkgconfig -" -PATCHES=( - "${FILESDIR}"/${PN}-5.31-pragma.patch - "${FILESDIR}"/${PN}-6.01-gentoo.patch - "${FILESDIR}"/${PN}-6.07-gcc.patch - "${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch -# "${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch -# "${FILESDIR}"/${PN}-6.01-non-gtk-install.patch - "${FILESDIR}"/${PN}-6.01-configure-install_sh.patch -# "${FILESDIR}"/${PN}-6.03-without-gl-configure.patch - "${FILESDIR}"/${PN}-6.05-remove-update-icon-cache.patch -# "${FILESDIR}"/${PN}-6.05-r2-configure-exit-codes.patch -# "${FILESDIR}"/${PN}-6.05-get-dirs-from-gtk3.0-in-configure.patch - "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch - "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch -) - -DOCS=( README{,.hacking} ) - -# see https://bugs.gentoo.org/898328 -QA_CONFIG_IMPL_DECL_SKIP=( getspnam_shadow ) - -src_prepare() { - default - - # bug #896440 - mv po/ca.po po/ca.po.old || die - iconv -f ISO-8859-15 -t UTF-8 po/ca.po.old >po/ca.po || die - - sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die - - if use systemd; then - # Causes "Failed to enable unit: Cannot alias xscreensaver.service as org.jwz.xscreensaver." - # after "systemctl --user enable xscreensaver". - sed -i -e '/^Alias=org.jwz.xscreensaver.service/d' \ - driver/xscreensaver.service.in || die - - eapply "${DISTDIR}/${PN}-6.07-xscreensaver.service-start-with-no-splash.patch" - fi - - strip-linguas -i po/ - export ALL_LINGUAS="${LINGUAS}" - - if use new-login && ! use gdm; then #392967 - sed -i \ - -e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \ - configure{,.ac} || die - fi - - # We are patching driver/XScreenSaver.ad.in, so let's delete the - # header generated from it so that it gets back in sync during build: - rm driver/XScreenSaver_ad.h || die - - if ! use offensive; then - sed -i \ - -e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \ - hacks/barcode.c || die - sed -i \ - -e 's|erect penis|shuffle board|g' \ - -e 's|flaccid penis|flaccid anchor|g' \ - -e 's|vagina|engagement ring|g' \ - -e 's|Penis|Shuttle|g' \ - hacks/glx/glsnake.c || die - sed -i \ - 's| Stay.*fucking mask\.$||' \ - hacks/glx/covid19.man \ - hacks/config/covid19.xml || die - eapply "${FILESDIR}/xscreensaver-6.05-teach-handsy-some-manners.patch" - fi - - if use logind-idle-hint; then - eapply "${DISTDIR}/${PN}-6.06-logind-idle-hint.patch" - fi - - config_rpath_update "${S}"/config.rpath - - # Must be eauto*re*conf, to force the rebuild - eautoreconf -} - -src_configure() { - if use ppc || use ppc64; then - filter-flags -maltivec -mabi=altivec - append-flags -U__VEC__ - fi - - unset BC_ENV_ARGS #24568 - - # /proc/interrupts won't always have the keyboard bits needed - # Not clear this does anything in 6.03+(?) but let's keep it for now in case. - # (See also: configure argument) - export ac_cv_have_proc_interrupts=yes - - # WARNING: This is NOT a normal autoconf script - # Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X" - ECONF_OPTS=( - $(use_enable locking) - $(use_with elogind) - --with-pixbuf - $(use_with gles) - $(use_with glx) - --with-gtk - $(use_with new-login login-manager) - $(use_with pam) - $(use_with suid setuid-hacks) - $(use_with systemd) - $(use_with xinerama xinerama-ext) - --with-jpeg=$(usex jpeg yes no) - --with-png=yes - --with-xft=yes - --with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults - --with-configdir="${EPREFIX}"/usr/share/${PN}/config - --with-dpms-ext - --with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN} - --with-proc-interrupts - --with-randr-ext - --with-text-file="${EPREFIX}"/etc/gentoo-release - --with-xdbe-ext - --with-xf86gamma-ext - --with-xf86vmode-ext - --with-xinput-ext - --with-xkb-ext - --with-xshm-ext - --without-gle - --without-kerberos - --without-motif - --with-proc-oom - --x-includes="${EPREFIX}"/usr/include - --x-libraries="${EPREFIX}"/usr/$(get_libdir) - ) - # WARNING: This is NOT a normal autoconf script - econf "${ECONF_OPTS[@]}" -} - -src_compile() { - # stock target is "default", which is broken in some releases. - emake all -} - -src_install() { - use pam && dodir /etc/pam.d/ - emake install_prefix="${D}" DESTDIR="${D}" GTK_SHAREDIR="${installprefix}"/usr/share/xscreensaver install - - if use fonts; then - # Do not install fonts with unclear licensing - rm -v "${ED}${FONTDIR}"/gallant12x22.ttf || die - - # Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf) - rm -v "${ED}${FONTDIR}"/luximr.ttf || die - - font_xfont_config - else - rm -rfv "${ED}${FONTDIR}" || die #812473 - fi - - einstalldocs - - if use pam; then - fperms 755 /usr/bin/${PN} - pamd_mimic_system ${PN} auth - fi - - if use systemd; then - systemd_douserunit "${ED}/usr/share/${PN}/xscreensaver.service" - fi - # Makefile installs xscreensaver.service regardless of - # --without-systemd, and if USE=systemd, we will have installed the - # unit file already. - rm "${ED}/usr/share/${PN}/xscreensaver.service" || die - - # bug #885989 - fperms 4755 /usr/$(get_libdir)/misc/xscreensaver/xscreensaver-auth -} - -pkg_postinst() { - use fonts && font_pkg_postinst - - # bug #811885 - if ! use glx; then - elog "Enable USE='glx' if OpenGL screensavers are crashing." - fi - - optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi - optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi - optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf - - xdg_icon_cache_update -} - -pkg_postrm() { - use fonts && font_pkg_postrm - xdg_icon_cache_update -} diff --git a/x11-misc/xsnow/xsnow-3.7.5.ebuild b/x11-misc/xsnow/xsnow-3.7.5.ebuild index 313b18f10e86..dc980eaffc4e 100644 --- a/x11-misc/xsnow/xsnow-3.7.5.ebuild +++ b/x11-misc/xsnow/xsnow-3.7.5.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://www.ratrabbit.nl/downloads/xsnow/${P}.tar.gz" LICENSE="freedist" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 sparc ~x86" +KEYWORDS="amd64 ~arm64 ~ppc ppc64 sparc ~x86" RDEPEND=" dev-libs/glib:2 diff --git a/x11-misc/xsnow/xsnow-3.8.1.ebuild b/x11-misc/xsnow/xsnow-3.8.1.ebuild index 6964d729ff1c..666605987eda 100644 --- a/x11-misc/xsnow/xsnow-3.8.1.ebuild +++ b/x11-misc/xsnow/xsnow-3.8.1.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 + inherit autotools xdg DESCRIPTION="let it snow on your desktop and windows" @@ -12,6 +13,9 @@ LICENSE="freedist" SLOT="0" KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + RDEPEND=" dev-libs/glib:2 sci-libs/gsl:= @@ -29,6 +33,12 @@ RDEPEND=" DEPEND=" ${RDEPEND} x11-base/xorg-proto + test? ( + media-gfx/scrot + x11-apps/xdpyinfo + x11-base/xorg-server[xvfb] + x11-misc/xdotool + ) " PATCHES=( "${FILESDIR}"/${PN}-3.0.7-gamesdir.patch diff --git a/x11-misc/xteddy/xteddy-2.2.ebuild b/x11-misc/xteddy/xteddy-2.2.ebuild index 32e5717252ec..dcfcdebd5052 100644 --- a/x11-misc/xteddy/xteddy-2.2.ebuild +++ b/x11-misc/xteddy/xteddy-2.2.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit autotools DESCRIPTION="A cuddly teddy bear (or other image) for your X desktop" -HOMEPAGE="http://webstaff.itn.liu.se/~stegu/xteddy/" +HOMEPAGE="https://salsa.debian.org/games-team/xteddy" SRC_URI="http://webstaff.itn.liu.se/~stegu/${PN}/${P}.tar.gz" LICENSE="GPL-2" diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest index 1cbda4530a73..afd30a40e4c5 100644 --- a/x11-misc/xtermcontrol/Manifest +++ b/x11-misc/xtermcontrol/Manifest @@ -1 +1,2 @@ +DIST xtermcontrol-3.10.tar.gz 187902 BLAKE2B 781ae40aa17cc57e9ac52544e1d04282a04024a489881577bbbcb782155612f9504eb58d4e80050535ac286180327a1469c5049d701f431d3f93557e5c29d509 SHA512 a7d4b3d5e7f9e7cd0c7a85c11584528d73507d258d3c48b832e2f842c88967d40a867c4ea75503dfd5288949992a6f6ead2a9fd73e9695c490e2935a133a92d2 DIST xtermcontrol-3.8.tar.gz 181399 BLAKE2B b65acd8ecdf6e0293fcd856cd05f7a3c2eaf868f6f7e0ea34829fbfece4e2a17c2085042e6eeb50a20504200db754badde8ffba0305358547d5f65cf18df564c SHA512 9dacddc57c31705d00f52753f906cd83ae4b7ae34ff2e712869becc452535dbce9fb3e0e9aaf689b55edd34889d9e37553e3702c26ccbd136f544016fcfedbf1 diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.10.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.10.ebuild new file mode 100644 index 000000000000..8b73bc9ddfb4 --- /dev/null +++ b/x11-misc/xtermcontrol/xtermcontrol-3.10.ebuild @@ -0,0 +1,12 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="xtermcontrol enables dynamic control of XFree86 xterm properties" +HOMEPAGE="https://www.thrysoee.dk/xtermcontrol/" +SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" diff --git a/x11-misc/xvfb-run/Manifest b/x11-misc/xvfb-run/Manifest index 3285e30961cb..619f9d15f28c 100644 --- a/x11-misc/xvfb-run/Manifest +++ b/x11-misc/xvfb-run/Manifest @@ -1,5 +1,3 @@ -DIST xorg-server_21.1.10-1.diff.gz 168382 BLAKE2B ef41295c9f45836b99aa09f2bea632ff909796538d5f6adb42db78b7b57a4ff41ad997657923820d4c703f21ab43ad2f83998391d8090b30717c600ddf7b8162 SHA512 417b5dcc167b5b066802e70754817aa0c8b22294c779084fca0ca85d0ca926b5b59b633adb2794f31715ff6c36677ea61cb4c7ebd4f32f97471d9257f327c8fb -DIST xorg-server_21.1.11-2.diff.gz 169271 BLAKE2B 79318e2395e60c2deebaa456e5b43ae3a0f095ddd3e9ff179d9861d48166823e4ed4356ae60fafc8e7703ab10bade80d8fed773f636e0d2355f241d8e31ff809 SHA512 42a782544e674e0ae0b95093d65c0b66224ab12cdf08e47eff1f605d1f8bf149dcdc6267f29748823b529a045b6f994c6f6614ff38811fe6c25d6c7c6640cb40 -DIST xorg-server_21.1.12-1.diff.gz 169446 BLAKE2B 3e56e2dd9c660c5107c2d2ea0e5a19a9d441ea556097fdb1af954c74f2c15a184d3f70c4b3482528cfbe323b3e37751dc3b8d05055a991f9e71d388d114e639c SHA512 05bf602379d220a4ece9308d64bf1c7f2be8ba597fe8c179cea62bfbfb2c36516e4d6ef2ea4374861c9550b55bb74dfe93dcc04fdb8eea8fbd6a4831b8db3edf DIST xorg-server_21.1.13-2.diff.gz 178467 BLAKE2B 8368680c01bd1c3e13936d4fa12ee955fe1bf568dfff9872c01659f39565ac6fb99b3d61db34529c2afb2bb42cc9fe974ea5fa281ac7437159b9339b5c918a2a SHA512 76fc7a879a00719ce1a59ba1e3e1d10bf438b04100776c00e33372be13323ab523a245d702924e3ea2c0624e71cffba1222980a8edbeb774cdfff2bcc6cbf47b +DIST xorg-server_21.1.15-2.diff.gz 179051 BLAKE2B fc80c146998cac19d728b3e1f6d172fdd14874bff55d1a24f1143a841e87d45700c739f644add27f4a62b139e50624004f20ed9ac05f512133fea17427b1d24a SHA512 0aaaf8d7a17991b58cda08f10c628f4d97814b1590134bfec7860997f5d6bb0d473a32fed327b191fb89b1d83aaa7e0f4a2b9db84c1669bedcb991c43c28cea3 DIST xorg-server_21.1.7-1.diff.gz 168149 BLAKE2B 68011ab5d77efec6c42921c906ff1be4f7b3b2455025d5fb8f33270bddf02f1bd2c3fd0997b9ad356298d0ee4b8b2f1af6244b39281756259a737e3a5d7a6814 SHA512 433f8d19691f3d0f8bd04f4d8dbd201079da8503d4174d01894824b8239c032af35727e5502b4a2491d9975ba0c6ba6d55c504fbc23c0ca65cc7ba695594d143 diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild deleted file mode 100644 index a022cc835edb..000000000000 --- a/x11-misc/xvfb-run/xvfb-run-21.1.11.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN=xorg-server -MY_PV="$(ver_cut 1-3)-$(ver_cut 4)" -DESCRIPTION="Run a command in a virtual X server environment" -HOMEPAGE="https://packages.debian.org/sid/xvfb" -SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" - -BDEPEND="dev-util/patchutils" -RDEPEND="x11-apps/xauth - x11-base/xorg-server[xvfb]" - -S="${WORKDIR}"/ - -src_prepare() { - # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch - assert "filterdiff+patch failed" - eapply_user -} - -src_install() { - doman ${PN}.1 - dobin ${PN} -} diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild deleted file mode 100644 index a022cc835edb..000000000000 --- a/x11-misc/xvfb-run/xvfb-run-21.1.12.1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -MY_PN=xorg-server -MY_PV="$(ver_cut 1-3)-$(ver_cut 4)" -DESCRIPTION="Run a command in a virtual X server environment" -HOMEPAGE="https://packages.debian.org/sid/xvfb" -SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" - -BDEPEND="dev-util/patchutils" -RDEPEND="x11-apps/xauth - x11-base/xorg-server[xvfb]" - -S="${WORKDIR}"/ - -src_prepare() { - # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch - assert "filterdiff+patch failed" - eapply_user -} - -src_install() { - doman ${PN}.1 - dobin ${PN} -} diff --git a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild b/x11-misc/xvfb-run/xvfb-run-21.1.15.2.ebuild index a022cc835edb..a35f7168d893 100644 --- a/x11-misc/xvfb-run/xvfb-run-21.1.10.1.ebuild +++ b/x11-misc/xvfb-run/xvfb-run-21.1.15.2.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 @@ -9,19 +9,22 @@ DESCRIPTION="Run a command in a virtual X server environment" HOMEPAGE="https://packages.debian.org/sid/xvfb" SRC_URI="mirror://debian/pool/main/${MY_PN:0:1}/${MY_PN}/${MY_PN}_${MY_PV}.diff.gz" +S="${WORKDIR}"/ + LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" BDEPEND="dev-util/patchutils" RDEPEND="x11-apps/xauth x11-base/xorg-server[xvfb]" -S="${WORKDIR}"/ - src_prepare() { # Not in src_unpack to silence warning "'patch' call should be moved to src_prepare" - filterdiff --include='*xvfb-run*' ${MY_PN}_${MY_PV}.diff | patch + filterdiff \ + --include='*/xvfb-run*' \ + --exclude='*/tests/*' \ + ${MY_PN}_${MY_PV}.diff | patch assert "filterdiff+patch failed" eapply_user } diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest index 810472407ad9..babf71350838 100644 --- a/x11-misc/zim/Manifest +++ b/x11-misc/zim/Manifest @@ -1 +1,3 @@ DIST zim-0.75.2.tar.gz 3257345 BLAKE2B 452716cbc6c149645c5146d8fcef2449c7c316ac57da9870dbe26b9fec13b6827a6368295277dc3b2b7a7874a7c930da27612a8e8e00b295ae9ecb3942d0e65b SHA512 ea6f361047690dfb314a3510d34880a4831d142c94fc0ca08e1c29869fd42d5fd1182c47edc241edeb512fed601a474af6d9970f819e8a8b67135c7589ae461a +DIST zim-0.76.0.tar.gz 3363266 BLAKE2B 36a34965ede3f544926bba515e66fdf6e1fbb211ecba96eaf9778f3e52cc6bacee5f03c91aadf0c4290f27b96e93fae450c3563c78be443e12aee84a5e0c65cb SHA512 f8504d936db7335a7f31c011b710e785ee58d2c9321e12dbd15848a4326ac24df7bc8069c4d2c8d07c2f537a694d9cf48be7acd36ab8a60b9ba35b4f3e094f8e +DIST zim-0.76.1.tar.gz 3369893 BLAKE2B 7a5e7857b8785d593150ef01eca749dd5de9c1a7a70a208a12ae4bd56de59aa2552d93bfc9f302c3c7507a5b19deea353b56611befd2e19e6ed0ea047ddab649 SHA512 a6ca8bd93dede9b1b8a91133bbfa414f67fd9c4dc80ac8bd20df224a494268aad2d4ca0563076859a034835c2396e7550a01d185aba1abb5d9512d8fcbdcf7e3 diff --git a/x11-misc/zim/zim-0.76.0.ebuild b/x11-misc/zim/zim-0.76.0.ebuild new file mode 100644 index 000000000000..bc5254db5c21 --- /dev/null +++ b/x11-misc/zim/zim-0.76.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..13} ) +PYTHON_REQ_USE="sqlite" +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=1 +VIRTUALX_REQUIRED=test +inherit distutils-r1 optfeature virtualx xdg + +DESCRIPTION="A desktop wiki" +HOMEPAGE=" + https://zim-wiki.org/ + https://github.com/zim-desktop-wiki/zim-desktop-wiki +" +SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-} + +LICENSE="BSD GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~riscv ~x86" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + ') + x11-libs/gtk+:3[introspection] + x11-misc/xdg-utils +" +DEPEND="${RDEPEND}" + +DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md ) +PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch ) + +python_prepare_all() { + if [[ ${LINGUAS} ]]; then + local lingua + for lingua in translations/*.po; do + lingua=${lingua/.po} + lingua=${lingua/translations\/} + has ${lingua} ${LINGUAS} || \ + { rm translations/${lingua}.po || die; } + done + fi + + distutils-r1_python_prepare_all + export XDG_RUNTIME_DIR=fakethis +} + +python_compile() { + sed -e "s#./build#${BUILD_DIR}/build#" -i setup.py || die + + distutils-r1_python_compile +} + +python_test() { + if has_version dev-vcs/git; then + git config --global user.email "git@example.com" || die + git config --global user.name "GitExample" || die + fi + + virtx ./test.py +} + +src_install() { + distutils-r1_src_install + + insinto /usr/share/icons + doins -r xdg/hicolor +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Spell checker" app-text/gtkspell[introspection] + optfeature "GNU R Plot Editor" dev-lang/R + optfeature "Version control Bazaar support" dev-vcs/breezy + optfeature "Diagram Editor" media-gfx/graphviz + optfeature "Insert Screenshot" "media-gfx/imagemagick media-gfx/scrot" + optfeature "Score Editor" media-sound/lilypond + optfeature "Gnuplot Editor" sci-visualization/gnuplot + optfeature "Equation Editor" virtual/latex-base app-text/dvipng +} diff --git a/x11-misc/zim/zim-0.76.1.ebuild b/x11-misc/zim/zim-0.76.1.ebuild new file mode 100644 index 000000000000..bc5254db5c21 --- /dev/null +++ b/x11-misc/zim/zim-0.76.1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..13} ) +PYTHON_REQ_USE="sqlite" +DISTUTILS_USE_PEP517=setuptools +DISTUTILS_SINGLE_IMPL=1 +VIRTUALX_REQUIRED=test +inherit distutils-r1 optfeature virtualx xdg + +DESCRIPTION="A desktop wiki" +HOMEPAGE=" + https://zim-wiki.org/ + https://github.com/zim-desktop-wiki/zim-desktop-wiki +" +SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" +S=${WORKDIR}/${PN}-desktop-wiki-${PV/_/-} + +LICENSE="BSD GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~riscv ~x86" + +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + ') + x11-libs/gtk+:3[introspection] + x11-misc/xdg-utils +" +DEPEND="${RDEPEND}" + +DOCS=( CHANGELOG.md CONTRIBUTING.md PLUGIN_WRITING.md README.md ) +PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch ) + +python_prepare_all() { + if [[ ${LINGUAS} ]]; then + local lingua + for lingua in translations/*.po; do + lingua=${lingua/.po} + lingua=${lingua/translations\/} + has ${lingua} ${LINGUAS} || \ + { rm translations/${lingua}.po || die; } + done + fi + + distutils-r1_python_prepare_all + export XDG_RUNTIME_DIR=fakethis +} + +python_compile() { + sed -e "s#./build#${BUILD_DIR}/build#" -i setup.py || die + + distutils-r1_python_compile +} + +python_test() { + if has_version dev-vcs/git; then + git config --global user.email "git@example.com" || die + git config --global user.name "GitExample" || die + fi + + virtx ./test.py +} + +src_install() { + distutils-r1_src_install + + insinto /usr/share/icons + doins -r xdg/hicolor +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "Spell checker" app-text/gtkspell[introspection] + optfeature "GNU R Plot Editor" dev-lang/R + optfeature "Version control Bazaar support" dev-vcs/breezy + optfeature "Diagram Editor" media-gfx/graphviz + optfeature "Insert Screenshot" "media-gfx/imagemagick media-gfx/scrot" + optfeature "Score Editor" media-sound/lilypond + optfeature "Gnuplot Editor" sci-visualization/gnuplot + optfeature "Equation Editor" virtual/latex-base app-text/dvipng +} |