From 178553179eb99f7d1d02f77f00927119307d7369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 7 Oct 2023 20:45:12 +0200 Subject: [PATCH] Update to 2.3 - Fixes: rhbz#2242609 --- ...ve-sub-classing-from-OO.o-mime-types.patch | 88 +++++++++---------- shared-mime-info-2.1-CFLAGS.patch | 12 +-- shared-mime-info.spec | 5 +- sources | 4 +- 4 files changed, 56 insertions(+), 53 deletions(-) diff --git a/0001-Remove-sub-classing-from-OO.o-mime-types.patch b/0001-Remove-sub-classing-from-OO.o-mime-types.patch index 48516d9..b46b0cd 100644 --- a/0001-Remove-sub-classing-from-OO.o-mime-types.patch +++ b/0001-Remove-sub-classing-from-OO.o-mime-types.patch @@ -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 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. - OpenOffice Calc spreadsheet + LibreOffice Calc spreadsheet - -@@ -890,7 +889,6 @@ command to generate the output files. +@@ -954,7 +953,6 @@ command to generate the output files. - OpenOffice Calc template + LibreOffice Calc template - -@@ -903,7 +901,6 @@ command to generate the output files. +@@ -967,7 +965,6 @@ command to generate the output files. - OpenOffice Draw drawing + LibreOffice Draw drawing - -@@ -916,7 +913,6 @@ command to generate the output files. +@@ -980,7 +977,6 @@ command to generate the output files. - OpenOffice Draw template + LibreOffice Draw template - -@@ -929,7 +925,6 @@ command to generate the output files. +@@ -993,7 +989,6 @@ command to generate the output files. - OpenOffice Impress presentation + LibreOffice Impress presentation - -@@ -942,7 +937,6 @@ command to generate the output files. +@@ -1006,7 +1001,6 @@ command to generate the output files. - OpenOffice Impress template + LibreOffice Impress template - -@@ -955,7 +949,6 @@ command to generate the output files. +@@ -1019,7 +1013,6 @@ command to generate the output files. - OpenOffice Math formula + LibreOffice Math formula - -@@ -968,7 +961,6 @@ command to generate the output files. +@@ -1032,7 +1025,6 @@ command to generate the output files. - OpenOffice Writer document + LibreOffice Writer document - -@@ -981,7 +973,6 @@ command to generate the output files. +@@ -1045,7 +1037,6 @@ command to generate the output files. - OpenOffice Writer global document + LibreOffice Writer global document - -@@ -994,7 +985,6 @@ command to generate the output files. +@@ -1058,7 +1049,6 @@ command to generate the output files. - OpenOffice Writer template + LibreOffice Writer template - -@@ -1009,7 +999,6 @@ command to generate the output files. +@@ -1073,7 +1063,6 @@ command to generate the output files. ODT document ODT OpenDocument Text @@ -100,7 +100,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1024,7 +1013,6 @@ command to generate the output files. +@@ -1088,7 +1077,6 @@ command to generate the output files. ODT document (Flat XML) FODT OpenDocument Text (Flat XML) @@ -108,7 +108,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1032,7 +1020,6 @@ command to generate the output files. +@@ -1096,7 +1084,6 @@ command to generate the output files. ODT template ODT OpenDocument Text @@ -116,7 +116,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1047,7 +1034,6 @@ command to generate the output files. +@@ -1111,7 +1098,6 @@ command to generate the output files. OTH template OTH OpenDocument HTML @@ -124,7 +124,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1062,7 +1048,6 @@ command to generate the output files. +@@ -1126,7 +1112,6 @@ command to generate the output files. ODM document ODM OpenDocument Master @@ -132,7 +132,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1077,7 +1062,6 @@ command to generate the output files. +@@ -1141,7 +1126,6 @@ command to generate the output files. ODG drawing ODG OpenDocument Drawing @@ -140,7 +140,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1092,7 +1076,6 @@ command to generate the output files. +@@ -1156,7 +1140,6 @@ command to generate the output files. ODG drawing (Flat XML) FODG OpenDocument Drawing (Flat XML) @@ -148,7 +148,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1100,7 +1083,6 @@ command to generate the output files. +@@ -1164,7 +1147,6 @@ command to generate the output files. ODG template ODG OpenDocument Drawing @@ -156,7 +156,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1115,7 +1097,6 @@ command to generate the output files. +@@ -1179,7 +1161,6 @@ command to generate the output files. ODP presentation ODP OpenDocument Presentation @@ -164,7 +164,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1130,7 +1111,6 @@ command to generate the output files. +@@ -1194,7 +1175,6 @@ command to generate the output files. ODP presentation (Flat XML) FODP OpenDocument Presentation (Flat XML) @@ -172,7 +172,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1138,7 +1118,6 @@ command to generate the output files. +@@ -1202,7 +1182,6 @@ command to generate the output files. ODP template ODP OpenDocument Presentation @@ -180,7 +180,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1153,7 +1132,6 @@ command to generate the output files. +@@ -1217,7 +1196,6 @@ command to generate the output files. ODS spreadsheet ODS OpenDocument Spreadsheet @@ -188,7 +188,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1168,7 +1146,6 @@ command to generate the output files. +@@ -1232,7 +1210,6 @@ command to generate the output files. ODS spreadsheet (Flat XML) FODS OpenDocument Spreadsheet (Flat XML) @@ -196,7 +196,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1176,7 +1153,6 @@ command to generate the output files. +@@ -1240,7 +1217,6 @@ command to generate the output files. ODS template ODS OpenDocument Spreadsheet @@ -204,7 +204,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1191,7 +1167,6 @@ command to generate the output files. +@@ -1255,7 +1231,6 @@ command to generate the output files. ODC chart ODC OpenDocument Chart @@ -212,7 +212,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1206,7 +1181,6 @@ command to generate the output files. +@@ -1270,7 +1245,6 @@ command to generate the output files. ODC template ODC OpenDocument Chart @@ -220,7 +220,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1221,7 +1195,6 @@ command to generate the output files. +@@ -1285,7 +1259,6 @@ command to generate the output files. ODF formula ODF OpenDocument Formula @@ -228,7 +228,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1236,7 +1209,6 @@ command to generate the output files. +@@ -1300,7 +1273,6 @@ command to generate the output files. ODF template ODF OpenDocument Formula @@ -236,7 +236,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1251,7 +1223,6 @@ command to generate the output files. +@@ -1315,7 +1287,6 @@ command to generate the output files. ODB database ODB OpenDocument Database @@ -244,7 +244,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1267,7 +1238,6 @@ command to generate the output files. +@@ -1331,7 +1302,6 @@ command to generate the output files. ODI image ODI OpenDocument Image @@ -252,7 +252,7 @@ index 1c17b8d..ad464e1 100644 -@@ -1280,7 +1250,6 @@ command to generate the output files. +@@ -1344,7 +1314,6 @@ command to generate the output files. OpenOffice.org extension @@ -261,5 +261,5 @@ index 1c17b8d..ad464e1 100644 -- -2.26.2 +2.41.0 diff --git a/shared-mime-info-2.1-CFLAGS.patch b/shared-mime-info-2.1-CFLAGS.patch index 57bdf5f..d11ab5a 100644 --- a/shared-mime-info-2.1-CFLAGS.patch +++ b/shared-mime-info-2.1-CFLAGS.patch @@ -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 $@ $< diff --git a/shared-mime-info.spec b/shared-mime-info.spec index b15cca9..e18773e 100644 --- a/shared-mime-info.spec +++ b/shared-mime-info.spec @@ -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 diff --git a/sources b/sources index ac7a7ce..84cb10e 100644 --- a/sources +++ b/sources @@ -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