GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 11:35:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[kf5] Fix plugin installation paths when using the JSON plugin loader.

Browse Source 
rom-properties-kf5.so and xattrview-kf5.so are located in
KF5_PRPD_PLUGIN_INSTALL_DIR when using JSON loading, not
KF5_PLUGIN_INSTALL_DIR.

Ubuntu 22.04 has KF5 5.92.0; JSON loading was added in 5.89.0.

rom-properties-kf5.install:
- Update the paths.
- Remove the .desktop files, since they're not needed (or created)
  anymore.
This commit is contained in:
David Korth 2023-07-01 20:07:29 -04:00
parent 1727d7c0fa
commit 0e71d1ad37
7 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
debian/changelog vendored
View File

@ -1,3 +1,18 @@
rom-properties (2.2-1ppa2~jammy2) jammy; urgency=medium
* KF5: Fix plugin forwarder paths and don't attempt to install .desktop files.
KF5 5.89.0 supports JSON loading, and Ubuntu 22.04 has KF5 5.92.0.
-- David Korth <gerbilsoft@gerbilsoft.com> Sat, 01 Jul 2023 19:51:29 -0400
rom-properties (2.2-1ppa2~jammy1) jammy; urgency=medium
* Build for Ubuntu 22.04 "Jammy" Jellyfish.
PPA version bumped to ensure it updates from previous versions.
-- David Korth <gerbilsoft@gerbilsoft.com> Sat, 01 Jul 2023 19:39:35 -0400
rom-properties (2.2-1ppa2~jammy1) jammy; urgency=medium
* Build for Ubuntu 22.04 "Jammy" Jellyfish.

7
debian/rom-properties-kf5.install vendored
View File

@ -1,7 +1,6 @@
usr/lib/*/qt5/plugins/rom-properties-kf5.so
usr/lib/*/qt5/plugins/xattrview-kf5.so
usr/lib/*/qt5/plugins/kf5/propertiesdialog/rom-properties-kf5.so
usr/lib/*/qt5/plugins/kf5/propertiesdialog/xattrview-kf5.so
usr/lib/*/qt5/plugins/kf5/thumbcreator/rom-properties-kf5.so
usr/lib/*/qt5/plugins/kf5/kfilemetadata/kfilemetadata_rom-properties-kf5.so
usr/lib/*/qt5/plugins/kf5/overlayicon/overlayiconplugin_rom-properties-kf5.so
usr/share/kio/servicemenus/rp-convert-to-png.desktop
usr/share/kservices5/rom-properties-kf5.KPropertiesDialog.desktop
usr/share/kservices5/rom-properties-kf5.ThumbCreator.desktop

4
src/kde/kf5/ExtractorPluginForwarder.cpp
View File

@ -39,8 +39,12 @@ ExtractorPluginForwarder::ExtractorPluginForwarder(QObject *parent)
{
CHECK_UID();
#ifdef HAVE_JSON_PLUGIN_LOADER
QString pluginPath(QString::fromUtf8(KF5_PRPD_PLUGIN_INSTALL_DIR));
#else /* !HAVE_JSON_PLUGIN_LOADER */
// FIXME: Check the .desktop file?
QString pluginPath(QString::fromUtf8(KF5_PLUGIN_INSTALL_DIR));
#endif /* HAVE_JSON_PLUGIN_LOADER */
pluginPath += QLatin1String("/" SO_FILENAME);
// Attempt to load the plugin.

4
src/kde/kf5/OverlayIconPluginForwarder.cpp
View File

@ -37,8 +37,12 @@ OverlayIconPluginForwarder::OverlayIconPluginForwarder(QObject *parent)
{
CHECK_UID();
#ifdef HAVE_JSON_PLUGIN_LOADER
QString pluginPath(QString::fromUtf8(KF5_PRPD_PLUGIN_INSTALL_DIR));
#else /* !HAVE_JSON_PLUGIN_LOADER */
// FIXME: Check the .desktop file?
QString pluginPath(QString::fromUtf8(KF5_PLUGIN_INSTALL_DIR));
#endif /* HAVE_JSON_PLUGIN_LOADER */
pluginPath += QLatin1String("/rom-properties-kf5.so");
// Attempt to load the plugin.

3
src/kde/kf5/config.kf5.h.in
View File

@ -9,6 +9,9 @@
#ifndef __ROMPROPERTIES_KDE_KF5_CONFIG_H__
#define __ROMPROPERTIES_KDE_KF5_CONFIG_H__
/* Define to 1 if using the JSON plugin loader. */
#cmakedefine HAVE_JSON_PLUGIN_LOADER 1
/* KF5 plugin path */
#cmakedefine KF5_PLUGIN_INSTALL_DIR "@KF5_PLUGIN_INSTALL_DIR@"

3
src/kde/kf6/ExtractorPluginForwarder.cpp
View File

@ -39,8 +39,7 @@ ExtractorPluginForwarder::ExtractorPluginForwarder(QObject *parent)
{
CHECK_UID();
// FIXME: Check the .desktop file?
QString pluginPath(QString::fromUtf8(KF6_PLUGIN_INSTALL_DIR));
QString pluginPath(QString::fromUtf8(KF6_PRPD_PLUGIN_INSTALL_DIR));
pluginPath += QLatin1String("/" SO_FILENAME);
// Attempt to load the plugin.

3
src/kde/kf6/OverlayIconPluginForwarder.cpp
View File

@ -37,8 +37,7 @@ OverlayIconPluginForwarder::OverlayIconPluginForwarder(QObject *parent)
{
CHECK_UID();
// FIXME: Check the .desktop file?
QString pluginPath(QString::fromUtf8(KF6_PLUGIN_INSTALL_DIR));
QString pluginPath(QString::fromUtf8(KF6_PRPD_PLUGIN_INSTALL_DIR));
pluginPath += QLatin1String("/rom-properties-kf6.so");
// Attempt to load the plugin.