From 86f70a5d866ebc7f69668aa1d59e10ac556784f0 Mon Sep 17 00:00:00 2001 From: David Korth Date: Sat, 10 May 2025 18:12:47 -0400 Subject: [PATCH] [debian] 2.5.1: Build for Ubuntu 20.04 "Focal" Fossa. Main changes: - Disable GTK+ 2.x builds. (XFCE) - Disable KDE 4.x builds. - Enable system libzstd. - Enable system fmt. - Tracker API version increased to 3. --- debian/changelog | 14 ++++++++++ debian/control | 37 ++++----------------------- debian/rom-properties-kde4.docs | 5 ---- debian/rom-properties-kde4.install | 6 ----- debian/rom-properties-tracker.install | 20 +++++++-------- debian/rom-properties-xfce.docs | 5 ---- debian/rom-properties-xfce.install | 1 - debian/rules | 7 ++--- 8 files changed, 33 insertions(+), 62 deletions(-) delete mode 100644 debian/rom-properties-kde4.docs delete mode 100644 debian/rom-properties-kde4.install delete mode 100644 debian/rom-properties-xfce.docs delete mode 100644 debian/rom-properties-xfce.install diff --git a/debian/changelog b/debian/changelog index 9f8c36599..6970e7d21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +rom-properties (2.5.1-1ppa2~focal1) focal; urgency=medium + + * Build for Ubuntu 20.04 "Focal" Fossa. + + * Disable GTK+ 2.x builds. (XFCE) + * Disable KDE 4.x builds. + * Enable system libzstd. + * Enable system fmt. + * Tracker API version increased to 3. + + * PPA version bumped to ensure it updates from previous versions. + + -- David Korth Sat, 10 May 2025 18:07:50 -0400 + rom-properties (2.5.1-1ppa2~bionic2) bionic; urgency=medium * Update rom-properties-tracker.install so the files actually install diff --git a/debian/control b/debian/control index cdc69df02..be0985bfd 100644 --- a/debian/control +++ b/debian/control @@ -15,8 +15,6 @@ Build-Depends: nettle-dev, libpugixml-dev, libseccomp-dev, - libqt4-dev, - kdelibs5-dev, qtbase5-dev, qttools5-dev-tools, libkf5kio-dev | kio-dev, @@ -24,17 +22,17 @@ Build-Depends: libkf5filemetadata-dev, libkf5crash-dev, libglib2.0-dev, - libgtk2.0-dev, - libgdk-pixbuf2.0-dev, - libthunarx-2-dev, libgtk-3-dev, libcairo2-dev, libnautilus-extension-dev, + libcaja-extension-dev, libnemo-extension-dev, gettext, + libzstd-dev, liblz4-dev, liblzo2-dev, - libgsound-dev + libgsound-dev, + libfmt-dev Standards-Version: 3.9.8 Homepage: https://github.com/GerbilSoft/rom-properties Vcs-Git: https://github.com/GerbilSoft/rom-properties @@ -42,7 +40,7 @@ Vcs-Browser: https://github.com/GerbilSoft/rom-properties Package: rom-properties-all Architecture: any -Depends: ${misc:Depends}, libromdata6, rom-properties-kde4, rom-properties-kf5, rom-properties-xfce, rom-properties-gtk3, rom-properties-cli, rom-properties-tracker, rom-properties-utils, rom-properties-lang, rom-properties-thumbnailer-dbus +Depends: ${misc:Depends}, libromdata6, rom-properties-kf5, rom-properties-gtk3, rom-properties-cli, rom-properties-tracker, rom-properties-utils, rom-properties-lang, rom-properties-thumbnailer-dbus Description: ROM Properties Page shell extension (meta package) This shell extension provides thumbnailing and property page functionality for ROM images, disc images, and save files for various game consoles, @@ -61,17 +59,6 @@ Description: ROM Properties Page shell extension (shared library) This package contains the shared library containing common functionality used by all the UI frontends. -Package: rom-properties-kde4 -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6, rom-properties-utils, rom-properties-xdg -Recommends: rom-properties-lang -Description: ROM Properties Page shell extension (KDE4 UI frontend) - This shell extension provides thumbnailing and property page functionality - for ROM images, disc images, and save files for various game consoles, - including Nintendo GameCube and Wii. - . - This package contains the KDE4 UI frontend. - Package: rom-properties-kio-servicemenus Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6, rom-properties-utils @@ -97,20 +84,6 @@ Description: ROM Properties Page shell extension (KF5 UI frontend) . This package contains the KDE Frameworks 5 UI frontend. -Package: rom-properties-xfce -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6, rom-properties-utils, rom-properties-xdg, rom-properties-thumbnailer-dbus -Recommends: rom-properties-lang, rom-properties-tracker -Description: ROM Properties Page shell extension (GTK2 XFCE UI frontend) - This shell extension provides thumbnailing and property page functionality - for ROM images, disc images, and save files for various game consoles, - including Nintendo GameCube and Wii. - . - This package contains the XFCE (GTK+ 2.x) version. - . - The thumbnailer-dbus package is required for thumbnailing on - some XFCE versions. - Package: rom-properties-gtk3 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libromdata6, rom-properties-utils, rom-properties-xdg, rom-properties-thumbnailer-dbus diff --git a/debian/rom-properties-kde4.docs b/debian/rom-properties-kde4.docs deleted file mode 100644 index b580fff62..000000000 --- a/debian/rom-properties-kde4.docs +++ /dev/null @@ -1,5 +0,0 @@ -README.md -NETWORK.md -NEWS.md -doc/keys.conf.example -doc/rom-properties.conf.example diff --git a/debian/rom-properties-kde4.install b/debian/rom-properties-kde4.install deleted file mode 100644 index f6b21de7a..000000000 --- a/debian/rom-properties-kde4.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/lib/kde4/rom-properties-kde4.so -usr/lib/kde4/xattrview-kde4.so -usr/share/kde4/services/ServiceMenus/rp-convert-to-png.desktop -usr/share/kde4/services/rom-properties-kde4.KPropertiesDialog.desktop -usr/share/kde4/services/rom-properties-kde4.ThumbCreator.desktop -usr/share/kde4/services/xattrview-kde4.desktop diff --git a/debian/rom-properties-tracker.install b/debian/rom-properties-tracker.install index ee60fd67a..82a575a55 100644 --- a/debian/rom-properties-tracker.install +++ b/debian/rom-properties-tracker.install @@ -1,10 +1,10 @@ -usr/lib/*/tracker-miners-2.0/extract-modules/libextract-rom-properties.so -usr/share/tracker-miners/extract-rules/14-rp-application-packages.rule -usr/share/tracker-miners/extract-rules/14-rp-audio.rule -usr/share/tracker-miners/extract-rules/14-rp-banners.rule -usr/share/tracker-miners/extract-rules/14-rp-cd-images.rule -usr/share/tracker-miners/extract-rules/14-rp-disk-images.rule -usr/share/tracker-miners/extract-rules/14-rp-executables.rule -usr/share/tracker-miners/extract-rules/14-rp-rom-images.rule -usr/share/tracker-miners/extract-rules/14-rp-save-files.rule -usr/share/tracker-miners/extract-rules/14-rp-textures.rule +usr/lib/*/tracker-miners-3.0/extract-modules/libextract-rom-properties.so +usr/share/tracker3-miners/extract-rules/14-rp-application-packages.rule +usr/share/tracker3-miners/extract-rules/14-rp-audio.rule +usr/share/tracker3-miners/extract-rules/14-rp-banners.rule +usr/share/tracker3-miners/extract-rules/14-rp-cd-images.rule +usr/share/tracker3-miners/extract-rules/14-rp-disk-images.rule +usr/share/tracker3-miners/extract-rules/14-rp-executables.rule +usr/share/tracker3-miners/extract-rules/14-rp-rom-images.rule +usr/share/tracker3-miners/extract-rules/14-rp-save-files.rule +usr/share/tracker3-miners/extract-rules/14-rp-textures.rule diff --git a/debian/rom-properties-xfce.docs b/debian/rom-properties-xfce.docs deleted file mode 100644 index b580fff62..000000000 --- a/debian/rom-properties-xfce.docs +++ /dev/null @@ -1,5 +0,0 @@ -README.md -NETWORK.md -NEWS.md -doc/keys.conf.example -doc/rom-properties.conf.example diff --git a/debian/rom-properties-xfce.install b/debian/rom-properties-xfce.install deleted file mode 100644 index c6a2e2dd0..000000000 --- a/debian/rom-properties-xfce.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/thunarx-2/rom-properties-xfce.so diff --git a/debian/rules b/debian/rules index fb4802a8a..9ecdb2f08 100755 --- a/debian/rules +++ b/debian/rules @@ -18,13 +18,14 @@ CMAKE_OPTIONS := \ -DINSTALL_DEBUG=OFF \ -DINSTALL_APPARMOR=ON \ -DUSE_SECCOMP=ON \ - -DBUILD_KDE4=ON \ + -DBUILD_KDE4=OFF \ -DBUILD_KF5=ON \ - -DBUILD_XFCE=ON \ + -DBUILD_KF6=OFF \ + -DBUILD_XFCE=OFF \ -DBUILD_GTK3=ON \ -DBUILD_GTK4=OFF \ -DBUILD_CLI=ON \ - -DTRACKER_INSTALL_API_VERSION=2 \ + -DTRACKER_INSTALL_API_VERSION=3 \ -DENABLE_PVRTC=ON \ -DENABLE_OPENMP=ON \ -DENABLE_LTO=ON \