rpms/shared-mime-info
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2.3

Browse Source 
- Fixes: rhbz#2242609
This commit is contained in:
Miro Hrončok 2023-10-07 20:45:12 +02:00
parent c6a698c4e5
commit 178553179e
4 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
0001-Remove-sub-classing-from-OO.o-mime-types.patch
View File

@ -1,4 +1,4 @@
From dc15dd50b198b0b2a135abd16151206dd9acca75 Mon Sep 17 00:00:00 2001
From da0e63ccd86ead63e6b29828286897fb1236eb81 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 25 Aug 2011 10:54:47 +0100
Subject: [PATCH] Remove sub-classing from OO.o mime-types
@ -9,90 +9,90 @@ https://bugs.freedesktop.org/show_bug.cgi?id=40354
1 file changed, 31 deletions(-)
diff --git a/data/freedesktop.org.xml.in b/data/freedesktop.org.xml.in
index 1c17b8d..ad464e1 100644
index 8020b13..00e8d90 100644
--- a/data/freedesktop.org.xml.in
+++ b/data/freedesktop.org.xml.in
@@ -877,7 +877,6 @@ command to generate the output files.
@@ -941,7 +941,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.calc">
<comment>OpenOffice Calc spreadsheet</comment>
<comment>LibreOffice Calc spreadsheet</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -890,7 +889,6 @@ command to generate the output files.
@@ -954,7 +953,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.calc.template">
<comment>OpenOffice Calc template</comment>
<comment>LibreOffice Calc template</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -903,7 +901,6 @@ command to generate the output files.
@@ -967,7 +965,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.draw">
<comment>OpenOffice Draw drawing</comment>
<comment>LibreOffice Draw drawing</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="image-x-generic"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -916,7 +913,6 @@ command to generate the output files.
@@ -980,7 +977,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.draw.template">
<comment>OpenOffice Draw template</comment>
<comment>LibreOffice Draw template</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="image-x-generic"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -929,7 +925,6 @@ command to generate the output files.
@@ -993,7 +989,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.impress">
<comment>OpenOffice Impress presentation</comment>
<comment>LibreOffice Impress presentation</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -942,7 +937,6 @@ command to generate the output files.
@@ -1006,7 +1001,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.impress.template">
<comment>OpenOffice Impress template</comment>
<comment>LibreOffice Impress template</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-presentation"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -955,7 +949,6 @@ command to generate the output files.
@@ -1019,7 +1013,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.math">
<comment>OpenOffice Math formula</comment>
<comment>LibreOffice Math formula</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -968,7 +961,6 @@ command to generate the output files.
@@ -1032,7 +1025,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer">
<comment>OpenOffice Writer document</comment>
<comment>LibreOffice Writer document</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -981,7 +973,6 @@ command to generate the output files.
@@ -1045,7 +1037,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer.global">
<comment>OpenOffice Writer global document</comment>
<comment>LibreOffice Writer global document</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -994,7 +985,6 @@ command to generate the output files.
@@ -1058,7 +1049,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.sun.xml.writer.template">
<comment>OpenOffice Writer template</comment>
<comment>LibreOffice Writer template</comment>
- <sub-class-of type="application/zip"/>
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1009,7 +999,6 @@ command to generate the output files.
@@ -1073,7 +1063,6 @@ command to generate the output files.
<comment>ODT document</comment>
<acronym>ODT</acronym>
<expanded-acronym>OpenDocument Text</expanded-acronym>
@ -100,7 +100,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1024,7 +1013,6 @@ command to generate the output files.
@@ -1088,7 +1077,6 @@ command to generate the output files.
<comment>ODT document (Flat XML)</comment>
<acronym>FODT</acronym>
<expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym>
@ -108,7 +108,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-document"/>
<glob pattern="*.fodt"/>
</mime-type>
@@ -1032,7 +1020,6 @@ command to generate the output files.
@@ -1096,7 +1084,6 @@ command to generate the output files.
<comment>ODT template</comment>
<acronym>ODT</acronym>
<expanded-acronym>OpenDocument Text</expanded-acronym>
@ -116,7 +116,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1047,7 +1034,6 @@ command to generate the output files.
@@ -1111,7 +1098,6 @@ command to generate the output files.
<comment>OTH template</comment>
<acronym>OTH</acronym>
<expanded-acronym>OpenDocument HTML</expanded-acronym>
@ -124,7 +124,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="text-html"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1062,7 +1048,6 @@ command to generate the output files.
@@ -1126,7 +1112,6 @@ command to generate the output files.
<comment>ODM document</comment>
<acronym>ODM</acronym>
<expanded-acronym>OpenDocument Master</expanded-acronym>
@ -132,7 +132,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1077,7 +1062,6 @@ command to generate the output files.
@@ -1141,7 +1126,6 @@ command to generate the output files.
<comment>ODG drawing</comment>
<acronym>ODG</acronym>
<expanded-acronym>OpenDocument Drawing</expanded-acronym>
@ -140,7 +140,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="image-x-generic"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1092,7 +1076,6 @@ command to generate the output files.
@@ -1156,7 +1140,6 @@ command to generate the output files.
<comment>ODG drawing (Flat XML)</comment>
<acronym>FODG</acronym>
<expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym>
@ -148,7 +148,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="image-x-generic"/>
<glob pattern="*.fodg"/>
</mime-type>
@@ -1100,7 +1083,6 @@ command to generate the output files.
@@ -1164,7 +1147,6 @@ command to generate the output files.
<comment>ODG template</comment>
<acronym>ODG</acronym>
<expanded-acronym>OpenDocument Drawing</expanded-acronym>
@ -156,7 +156,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="image-x-generic"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1115,7 +1097,6 @@ command to generate the output files.
@@ -1179,7 +1161,6 @@ command to generate the output files.
<comment>ODP presentation</comment>
<acronym>ODP</acronym>
<expanded-acronym>OpenDocument Presentation</expanded-acronym>
@ -164,7 +164,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-presentation"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1130,7 +1111,6 @@ command to generate the output files.
@@ -1194,7 +1175,6 @@ command to generate the output files.
<comment>ODP presentation (Flat XML)</comment>
<acronym>FODP</acronym>
<expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym>
@ -172,7 +172,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-presentation"/>
<glob pattern="*.fodp"/>
</mime-type>
@@ -1138,7 +1118,6 @@ command to generate the output files.
@@ -1202,7 +1182,6 @@ command to generate the output files.
<comment>ODP template</comment>
<acronym>ODP</acronym>
<expanded-acronym>OpenDocument Presentation</expanded-acronym>
@ -180,7 +180,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-presentation"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1153,7 +1132,6 @@ command to generate the output files.
@@ -1217,7 +1196,6 @@ command to generate the output files.
<comment>ODS spreadsheet</comment>
<acronym>ODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
@ -188,7 +188,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1168,7 +1146,6 @@ command to generate the output files.
@@ -1232,7 +1210,6 @@ command to generate the output files.
<comment>ODS spreadsheet (Flat XML)</comment>
<acronym>FODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym>
@ -196,7 +196,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-spreadsheet"/>
<glob pattern="*.fods"/>
</mime-type>
@@ -1176,7 +1153,6 @@ command to generate the output files.
@@ -1240,7 +1217,6 @@ command to generate the output files.
<comment>ODS template</comment>
<acronym>ODS</acronym>
<expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
@ -204,7 +204,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1191,7 +1167,6 @@ command to generate the output files.
@@ -1255,7 +1231,6 @@ command to generate the output files.
<comment>ODC chart</comment>
<acronym>ODC</acronym>
<expanded-acronym>OpenDocument Chart</expanded-acronym>
@ -212,7 +212,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1206,7 +1181,6 @@ command to generate the output files.
@@ -1270,7 +1245,6 @@ command to generate the output files.
<comment>ODC template</comment>
<acronym>ODC</acronym>
<expanded-acronym>OpenDocument Chart</expanded-acronym>
@ -220,7 +220,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-spreadsheet"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1221,7 +1195,6 @@ command to generate the output files.
@@ -1285,7 +1259,6 @@ command to generate the output files.
<comment>ODF formula</comment>
<acronym>ODF</acronym>
<expanded-acronym>OpenDocument Formula</expanded-acronym>
@ -228,7 +228,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1236,7 +1209,6 @@ command to generate the output files.
@@ -1300,7 +1273,6 @@ command to generate the output files.
<comment>ODF template</comment>
<acronym>ODF</acronym>
<expanded-acronym>OpenDocument Formula</expanded-acronym>
@ -236,7 +236,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1251,7 +1223,6 @@ command to generate the output files.
@@ -1315,7 +1287,6 @@ command to generate the output files.
<comment>ODB database</comment>
<acronym>ODB</acronym>
<expanded-acronym>OpenDocument Database</expanded-acronym>
@ -244,7 +244,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="x-office-document"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1267,7 +1238,6 @@ command to generate the output files.
@@ -1331,7 +1302,6 @@ command to generate the output files.
<comment>ODI image</comment>
<acronym>ODI</acronym>
<expanded-acronym>OpenDocument Image</expanded-acronym>
@ -252,7 +252,7 @@ index 1c17b8d..ad464e1 100644
<generic-icon name="image-x-generic"/>
<magic priority="70">
<match type="string" value="PK\003\004" offset="0">
@@ -1280,7 +1250,6 @@ command to generate the output files.
@@ -1344,7 +1314,6 @@ command to generate the output files.
</mime-type>
<mime-type type="application/vnd.openofficeorg.extension">
<comment>OpenOffice.org extension</comment>
@ -261,5 +261,5 @@ index 1c17b8d..ad464e1 100644
<glob pattern="*.oxt" />
</mime-type>
--
2.26.2
2.41.0

12
shared-mime-info-2.1-CFLAGS.patch
View File

@ -2,10 +2,12 @@ diff -up shared-mime-info-2.1/xdgmime/Makefile.CFLAGS shared-mime-info-2.1/xdgmi
diff -up shared-mime-info-2.1/xdgmime/src/Makefile.CFLAGS shared-mime-info-2.1/xdgmime/src/Makefile
--- shared-mime-info-2.1/xdgmime/src/Makefile.CFLAGS 2020-12-30 03:24:55.000000000 -0600
+++ shared-mime-info-2.1/xdgmime/src/Makefile 2022-02-02 09:37:38.529264264 -0600
@@ -1,5 +1,5 @@
@@ -2,7 +2,7 @@
.PHONY: all clean
-CFLAGS=-Wall -Wmissing-prototypes -Wno-sign-compare -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP
+CFLAGS=-Wall -Wmissing-prototypes -Wno-sign-compare -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP $(RPM_OPT_FLAGS)
all: test-mime test-mime-data print-mime-data
C_STD = -std=c99 -D_POSIX_C_SOURCE=200809L
-ALL_CFLAGS = $(C_STD) -c -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP -Wall -Wmissing-prototypes -Wno-sign-compare $(CFLAGS)
+ALL_CFLAGS = $(C_STD) -c -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP $(RPM_OPT_FLAGS) -Wall -Wmissing-prototypes -Wno-sign-compare $(CFLAGS)
.c.o:
$(CC) $(ALL_CFLAGS) -o $@ $<

5
shared-mime-info.spec
View File

@ -1,6 +1,6 @@
Summary: Shared MIME information database
Name: shared-mime-info
Version: 2.2
Version: 2.3
Release: %autorelease
License: GPL-2.0-or-later
URL: http://freedesktop.org/Software/shared-mime-info
@ -8,7 +8,7 @@ Source0: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/%{version
Source1: mimeapps.list
%global xdgmime_commit de283fc430460b9b3a7e61432a6d273cd64cb102
%global xdgmime_commit 179296748e92bd91bf531656632a1056307fb7b7
# Tarball for https://gitlab.freedesktop.org/xdg/xdgmime/-/tree/%%{xdgmime_commit}
Source6: https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/%{xdgmime_commit}/xdgmime-%{xdgmime_commit}.tar.bz2
# HACK in use of RPM_OPT_FLAGS into xdgmime build
@ -18,6 +18,7 @@ Source7: shared-mime-info-2.1-CFLAGS.patch
Patch0: 0001-Remove-sub-classing-from-OO.o-mime-types.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libxml2-devel
BuildRequires: xmlto
BuildRequires: glib2-devel

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (xdgmime-de283fc430460b9b3a7e61432a6d273cd64cb102.tar.bz2) = 516d460cfb05f3dc240f22c4571d4f052aeb78a8f3bf69f23b487b1278025e1296efc38f87234a5504a9d1262930ae8c553d190c1a1d950ab6bb675c080acc1c
SHA512 (shared-mime-info-2.2.tar.bz2) = e32e78435b6bbcdd5abcd1b7708a715d14310f920742e762ce1d4a4f27c1215dbd6493f816d3bf8cf32cf8635a4cee031cf7ea7bad56c4034302273f25da1065
SHA512 (xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2) = efccff2672efb3ff0e44e83cfbaf6e2b926146e4a9d6132b14e2d7a88d602af340b3948793306ce5f720ac8b09e5d37d3b356a0cc269e8240b382558c9a3cf10
SHA512 (shared-mime-info-2.3.tar.bz2) = f1959933e93373ee6939b289d0c3c35d527ce6803865558e4a8bcb5a0183df2fc1148bbf58bfe9a97342e7125f2e0e39ac5dd3bae998510396d9b6c96a330762