mediainfo: Adapt to Plasma 6 changes

Signed-off-by: Reilly Brogan <reilly@reillybrogan.com>
getsolus · Mar 15, 2024 · 7cc2143 · 7cc2143
1 parent 0df3036
commit 7cc2143
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 8 deletions.
diff --git a/packages/m/mediainfo/files/0001-Adapt-KIO-service-menu-to-Plasma-6.patch b/packages/m/mediainfo/files/0001-Adapt-KIO-service-menu-to-Plasma-6.patch
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Reilly Brogan <reilly@reillybrogan.com>
+Date: Fri, 15 Mar 2024 16:15:50 -0500
+Subject: [PATCH] Adapt KIO service menu to Plasma 6
+
+This is still broken as KF6 doesn't seem to support multiple globs at the same time, and I have no idea why having `application/x-flash-video` breaks it. However, it is slightly _less_ broken than before where it didn't work _at all_.
+
+---
+ Project/GNU/GUI/Makefile.am                | 6 +++---
+ Project/GNU/GUI/mediainfo-gui.kde4.desktop | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Project/GNU/GUI/Makefile.am b/Project/GNU/GUI/Makefile.am
+index 20a7ec255..29a547a49 100644
+--- a/Project/GNU/GUI/Makefile.am
++++ b/Project/GNU/GUI/Makefile.am
+@@ -38,9 +38,9 @@ install-data-hook:
+ 	install -dm 755 $(DESTDIR)$(datadir)/kde4/services/ServiceMenus && \
+ 	install -m 644 mediainfo-gui.kde4.desktop \
+ 	               $(DESTDIR)$(datadir)/kde4/services/ServiceMenus/mediainfo-gui.desktop && \
+-	install -dm 755 $(DESTDIR)$(datadir)/kservices5/ServiceMenus && \
++	install -dm 755 $(DESTDIR)$(datadir)/kio/servicemenus && \
+ 	install -m 644 mediainfo-gui.kde4.desktop \
+-	               $(DESTDIR)$(datadir)/kservices5/ServiceMenus/mediainfo-gui.desktop && \
++	               $(DESTDIR)$(datadir)/kio/servicemenus/mediainfo-gui.desktop && \
+ 	install -dm 755 $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps && \
+ 	install -m 644 ../../../Source/Resource/Image/MediaInfo.png \
+ 	               $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/mediainfo.png && \
+@@ -54,7 +54,7 @@ install-data-hook:
+ uninstall-local:
+ 	( cd '$(DESTDIR)$(datadir)/apps/konqueror/servicemenus' && rm -f mediainfo-gui.desktop ) && \
+ 	( cd '$(DESTDIR)$(datadir)/kde4/services/ServiceMenus' && rm -f mediainfo-gui.desktop ) && \
+-	( cd '$(DESTDIR)$(datadir)/kservices5/ServiceMenus' && rm -f mediainfo-gui.desktop ) && \
++	( cd '$(DESTDIR)$(datadir)/kio/servicemenus' && rm -f mediainfo-gui.desktop ) && \
+ 	( cd '$(DESTDIR)$(datadir)/icons/hicolor/256x256/apps' && rm -f mediainfo.png ) && \
+ 	( cd '$(DESTDIR)$(datadir)/icons/hicolor/scalable/apps' && rm -f mediainfo.svg ) && \
+ 	( cd '$(DESTDIR)$(datadir)/pixmaps' && rm -f mediainfo.xpm )
+diff --git a/Project/GNU/GUI/mediainfo-gui.kde4.desktop b/Project/GNU/GUI/mediainfo-gui.kde4.desktop
+index 695cc319d..046843679 100644
+--- a/Project/GNU/GUI/mediainfo-gui.kde4.desktop
++++ b/Project/GNU/GUI/mediainfo-gui.kde4.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Service
+-Name=mediainfo-gui.desktop
+-ServiceTypes=KonqPopupMenu/Plugin,audio/*,video/*,image/*,application/x-flash-video
++ServiceTypes=KonqPopupMenu/Plugin;
++MimeType=audio/*,video/*,image/*;
+ Actions=mediainfo-gui
+ X-KDE-Priority=TopLevel
+ Keywords=media info;metadata;tag;video;audio;subtitles;chapters;codec;mkv;mpeg;mp3;h264;avc;h265;hevc;avi;
diff --git a/packages/m/mediainfo/monitoring.yml b/packages/m/mediainfo/monitoring.yml
@@ -0,0 +1,7 @@
+releases:
+  id: 8240
+  rss: https://github.com/MediaArea/MediaInfo/releases.atom
+security:
+  cpe:
+  - vendor: mediaarea
+    product: mediainfo
diff --git a/packages/m/mediainfo/package.yml b/packages/m/mediainfo/package.yml
@@ -1,6 +1,6 @@
 name       : mediainfo
 version    : '24.01'
-release    : 28
+release    : 29
 source     :
     - https://mediaarea.net/download/source/mediainfo/24.01/mediainfo_24.01.tar.bz2 : 3f859b26757051c7bb42d4765be3f7d677ad5260e465dd8338a361bbb91da897
 license    : BSD-2-Clause
@@ -14,6 +14,8 @@ builddeps  :
     - desktop-file-utils
     - wxwidgets-devel
 setup      : |
+    %patch -p1 -i $pkgfiles/0001-Adapt-KIO-service-menu-to-Plasma-6.patch
+
     pushd Project/GNU/CLI
         %autogen
     popd

diff --git a/packages/m/mediainfo/pspec_x86_64.xml b/packages/m/mediainfo/pspec_x86_64.xml
@@ -3,8 +3,8 @@
         <Name>mediainfo</Name>
         <Homepage>https://mediaarea.net/en/MediaInfo</Homepage>
         <Packager>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>solus@reillybrogan.com</Email>
         </Packager>
         <License>BSD-2-Clause</License>
         <PartOf>multimedia.video</PartOf>
@@ -27,18 +27,18 @@
             <Path fileType="data">/usr/share/icons/hicolor/256x256/apps/mediainfo.png</Path>
             <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/mediainfo.svg</Path>
             <Path fileType="data">/usr/share/kde4/services/ServiceMenus/mediainfo-gui.desktop</Path>
-            <Path fileType="data">/usr/share/kservices5/ServiceMenus/mediainfo-gui.desktop</Path>
+            <Path fileType="data">/usr/share/kio/servicemenus/mediainfo-gui.desktop</Path>
             <Path fileType="data">/usr/share/metainfo/mediainfo-gui.metainfo.xml</Path>
             <Path fileType="data">/usr/share/pixmaps/mediainfo.xpm</Path>
         </Files>
     </Package>
     <History>
-        <Update release="28">
-            <Date>2024-02-13</Date>
+        <Update release="29">
+            <Date>2024-03-15</Date>
             <Version>24.01</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Reilly Brogan</Name>
+            <Email>solus@reillybrogan.com</Email>
         </Update>
     </History>
 </PISI>