From 95add128a4b437e1c3b98b3f30980bbd579e2f08 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 21 Mar 2024 19:01:29 +0000 Subject: [PATCH] mingw-freetype package is retired on branch c10s for BAKERY-412 --- .gitignore | 33 --- dead.package | 1 + freetype-2.10.0-internal-outline.patch | 74 ----- freetype-2.2.1-enable-valid.patch | 21 -- freetype-2.3.0-enable-spr.patch | 12 - mingw-freetype.spec | 358 ------------------------- sources | 1 - 7 files changed, 1 insertion(+), 499 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 freetype-2.10.0-internal-outline.patch delete mode 100644 freetype-2.2.1-enable-valid.patch delete mode 100644 freetype-2.3.0-enable-spr.patch delete mode 100644 mingw-freetype.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b0f793e..0000000 --- a/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -freetype-2.3.11.tar.bz2 -freetype-doc-2.3.11.tar.gz -/freetype-2.4.5.tar.bz2 -/freetype-doc-2.4.5.tar.bz2 -/freetype-2.4.6.tar.bz2 -/freetype-doc-2.4.6.tar.bz2 -/freetype-2.4.8.tar.bz2 -/freetype-doc-2.4.8.tar.bz2 -/freetype-2.4.9.tar.bz2 -/freetype-2.4.10.tar.bz2 -/freetype-doc-2.4.10.tar.bz2 -/freetype-2.4.11.tar.bz2 -/freetype-2.4.12.tar.bz2 -/freetype-2.5.0.1.tar.bz2 -/freetype-2.5.3.tar.bz2 -/freetype-2.5.4.tar.bz2 -/freetype-2.6.tar.bz2 -/freetype-2.6.3.tar.bz2 -/freetype-2.6.5.tar.bz2 -/freetype-2.7.tar.bz2 -/freetype-2.7.1.tar.bz2 -/freetype-2.8.tar.bz2 -/freetype-2.9.1.tar.bz2 -/freetype-2.10.0.tar.bz2 -/freetype-2.10.1.tar.xz -/freetype-2.10.2.tar.xz -/freetype-2.10.4.tar.xz -/freetype-2.11.0.tar.xz -/freetype-2.11.1.tar.xz -/freetype-2.12.0.tar.xz -/freetype-2.12.1.tar.xz -/freetype-2.13.0.tar.xz -/freetype-2.13.1.tar.xz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..c2b2880 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +mingw-freetype package is retired on branch c10s for BAKERY-412 \ No newline at end of file diff --git a/freetype-2.10.0-internal-outline.patch b/freetype-2.10.0-internal-outline.patch deleted file mode 100644 index ed001a8..0000000 --- a/freetype-2.10.0-internal-outline.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -rupN --no-dereference freetype-2.13.1/include/freetype/ftoutln.h freetype-2.13.1-new/include/freetype/ftoutln.h ---- freetype-2.13.1/include/freetype/ftoutln.h 2023-04-30 16:42:51.000000000 +0200 -+++ freetype-2.13.1-new/include/freetype/ftoutln.h 2023-06-28 10:44:31.011064531 +0200 -@@ -166,6 +166,15 @@ FT_BEGIN_HEADER - FT_Int numContours, - FT_Outline *anoutline ); - -+ /* -+ * Kept downstream for ABI compatibility only. -+ * It just throws error now. Remove once soname has been bumped. -+ */ -+ FT_EXPORT( FT_Error ) -+ FT_Outline_New_Internal( FT_Memory memory, -+ FT_UInt numPoints, -+ FT_Int numContours, -+ FT_Outline *anoutline ); - - /************************************************************************** - * -@@ -193,6 +202,13 @@ FT_BEGIN_HEADER - FT_Outline_Done( FT_Library library, - FT_Outline* outline ); - -+ /* -+ * Kept downstream for ABI compatibility only. -+ * It just throws error now. Remove once soname has been bumped. -+ */ -+ FT_EXPORT( FT_Error ) -+ FT_Outline_Done_Internal( FT_Memory memory, -+ FT_Outline* outline ); - - /************************************************************************** - * -diff -rupN --no-dereference freetype-2.13.1/src/base/ftoutln.c freetype-2.13.1-new/src/base/ftoutln.c ---- freetype-2.13.1/src/base/ftoutln.c 2023-02-27 06:39:44.000000000 +0100 -+++ freetype-2.13.1-new/src/base/ftoutln.c 2023-06-28 10:44:31.012064536 +0200 -@@ -300,6 +300,19 @@ - - /* documentation is in ftoutln.h */ - -+ /* -+ * Kept downstream for ABI compatibility only. -+ * It just throws error now. Remove once soname has been bumped. -+ */ -+ FT_EXPORT_DEF( FT_Error ) -+ FT_Outline_New_Internal( FT_Memory memory, -+ FT_UInt numPoints, -+ FT_Int numContours, -+ FT_Outline *anoutline ) -+ { -+ return FT_THROW( Unimplemented_Feature ); -+ } -+ - FT_EXPORT_DEF( FT_Error ) - FT_Outline_New( FT_Library library, - FT_UInt numPoints, -@@ -432,6 +445,17 @@ - - /* documentation is in ftoutln.h */ - -+ /* -+ * Kept downstream for ABI compatibility only. -+ * It just throws error now. Remove once soname has been bumped. -+ */ -+ FT_EXPORT_DEF( FT_Error ) -+ FT_Outline_Done_Internal( FT_Memory memory, -+ FT_Outline* outline ) -+ { -+ return FT_THROW( Unimplemented_Feature ); -+ } -+ - FT_EXPORT_DEF( FT_Error ) - FT_Outline_Done( FT_Library library, - FT_Outline* outline ) diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch deleted file mode 100644 index 5fd7095..0000000 --- a/freetype-2.2.1-enable-valid.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rupN --no-dereference freetype-2.13.1/modules.cfg freetype-2.13.1-new/modules.cfg ---- freetype-2.13.1/modules.cfg 2023-02-27 06:39:44.000000000 +0100 -+++ freetype-2.13.1-new/modules.cfg 2023-06-28 10:44:30.849063756 +0200 -@@ -117,7 +117,7 @@ AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs `ftgxval.c' below. - # --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -136,7 +136,7 @@ AUX_MODULES += bzip2 - - # OpenType table validation. Needs `ftotval.c' below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/freetype-2.3.0-enable-spr.patch b/freetype-2.3.0-enable-spr.patch deleted file mode 100644 index 0b9ac2f..0000000 --- a/freetype-2.3.0-enable-spr.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN --no-dereference freetype-2.13.1/include/freetype/config/ftoption.h freetype-2.13.1-new/include/freetype/config/ftoption.h ---- freetype-2.13.1/include/freetype/config/ftoption.h 2023-05-23 13:05:51.000000000 +0200 -+++ freetype-2.13.1-new/include/freetype/config/ftoption.h 2023-06-28 10:44:30.680062947 +0200 -@@ -123,7 +123,7 @@ FT_BEGIN_HEADER - * When this macro is not defined, FreeType offers alternative LCD - * rendering technology that produces excellent output. - */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /************************************************************************** diff --git a/mingw-freetype.spec b/mingw-freetype.spec deleted file mode 100644 index 8cb8ead..0000000 --- a/mingw-freetype.spec +++ /dev/null @@ -1,358 +0,0 @@ -%{?mingw_package_header} - -Name: mingw-freetype -# NOTE See comment for Patch2 below -Version: 2.13.1 -Release: 1%{?dist} -Summary: Free and portable font rendering engine - -License: FTL OR GPL-2.0-or-later -URL: http://www.freetype.org -Source0: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.xz - -# Patches from native Fedora package: - -# Enable subpixel rendering (ClearType) -Patch0: freetype-2.3.0-enable-spr.patch -# Enable otvalid and gxvalid modules -Patch1: freetype-2.2.1-enable-valid.patch -# Re-add symbol downstream for ABI compatibility only. Remove once soname has been bumped from -6. -Patch2: freetype-2.10.0-internal-outline.patch - -BuildArch: noarch - -BuildRequires: gcc -BuildRequires: make - -BuildRequires: mingw32-filesystem >= 95 -BuildRequires: mingw32-gcc -BuildRequires: mingw32-binutils -BuildRequires: mingw32-zlib -BuildRequires: mingw32-bzip2 -BuildRequires: mingw32-libpng - -BuildRequires: mingw64-filesystem >= 95 -BuildRequires: mingw64-gcc -BuildRequires: mingw64-binutils -BuildRequires: mingw64-zlib -BuildRequires: mingw64-bzip2 -BuildRequires: mingw64-libpng - -%description -MinGW Windows Freetype library. - -# Win32 -%package -n mingw32-freetype -Summary: Free and portable font rendering engine - -%description -n mingw32-freetype -MinGW Windows Freetype library. - -%package -n mingw32-freetype-static -Summary: Static version of the MinGW Windows Freetype library -Requires: mingw32-freetype = %{version}-%{release} - -%description -n mingw32-freetype-static -Static version of the MinGW Windows Freetype library. - -# Win64 -%package -n mingw64-freetype -Summary: Free and portable font rendering engine - -%description -n mingw64-freetype -MinGW Windows Freetype library. - -%package -n mingw64-freetype-static -Summary: Static version of the MinGW Windows Freetype library -Requires: mingw64-freetype = %{version}-%{release} - -%description -n mingw64-freetype-static -Static version of the MinGW Windows Freetype library. - - -%{?mingw_debug_package} - - -%prep -%autosetup -p1 -n freetype-%{version} - - -%build -%mingw_configure \ - --enable-static \ - --enable-shared \ - --with-zlib=yes \ - --with-bzip2=yes \ - --with-png=yes \ - --enable-freetype-config \ - --with-harfbuzz=no - -%mingw_make_build - -# The ft2demos Makefile is hacky and doesn't understand -# cross-compilation. This nearly works, but not quite, so -# disable. it. -#pushd ft2demos-%{version} -#make TOP_DIR=".." PLATFORM=win32 -#popd - - -%install -%mingw_make_install - -# Drop all .la files -find %{buildroot} -name "*.la" -delete - -# Remove redundent man pages -rm -rf %{buildroot}%{mingw32_mandir} %{buildroot}%{mingw64_mandir} - - -%files -n mingw32-freetype -%license LICENSE.TXT -%{mingw32_bindir}/freetype-config -%{mingw32_bindir}/libfreetype-6.dll -%{mingw32_includedir}/freetype2 -%{mingw32_libdir}/libfreetype.dll.a -%{mingw32_libdir}/pkgconfig/freetype2.pc -%{mingw32_datadir}/aclocal/freetype2.m4 - -%files -n mingw32-freetype-static -%{mingw32_libdir}/libfreetype.a - -%files -n mingw64-freetype -%license LICENSE.TXT -%{mingw64_bindir}/freetype-config -%{mingw64_bindir}/libfreetype-6.dll -%{mingw64_includedir}/freetype2 -%{mingw64_libdir}/libfreetype.dll.a -%{mingw64_libdir}/pkgconfig/freetype2.pc -%{mingw64_datadir}/aclocal/freetype2.m4 - -%files -n mingw64-freetype-static -%{mingw64_libdir}/libfreetype.a - - -%changelog -* Wed Jun 28 2023 Sandro Mani - 2.13.1-1 -- Update to 2.13.1 - -* Tue Feb 28 2023 Sandro Mani - 2.13.0-1 -- Update to 2.13.0 - -* Thu Jan 19 2023 Fedora Release Engineering - 2.12.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 2.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue May 03 2022 Sandro Mani - 2.12.1-1 -- Update to 2.12.1 - -* Tue Apr 26 2022 Sandro Mani - 2.12.0-1 -- Update to 2.12.0 - -* Fri Mar 25 2022 Sandro Mani - 2.11.1-3 -- Rebuild with mingw-gcc-12 - -* Thu Jan 20 2022 Fedora Release Engineering - 2.11.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Dec 15 2021 Sandro Mani - 2.11.1-1 -- Update to 2.11.1 - -* Sat Jul 24 2021 Sandro Mani - 2.11.0-1 -- Update to 2.11.0 - -* Thu Jul 22 2021 Fedora Release Engineering - 2.10.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 2.10.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Oct 23 2020 Sandro Mani - 2.10.4-1 -- Update to 2.10.4 - -* Tue Jul 28 2020 Fedora Release Engineering - 2.10.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 18 2020 Sandro Mani - 2.10.2-1 -- Update to 2.10.2 - -* Fri Feb 07 2020 Sandro Mani - 2.10.1-1 -- Update to 2.10.1 - -* Wed Jan 29 2020 Fedora Release Engineering - 2.10.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Aug 30 2019 Sandro Mani - 2.10.0-1 -- Update to 2.10.0 - -* Thu Jul 25 2019 Fedora Release Engineering - 2.9.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 2.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Nov 01 2018 Kalev Lember - 2.9.1-1 -- Update to 2.9.1 -- Sync patches with the native package -- Enable ClearType code thanks to Microsoft joining OIN - -* Fri Jul 13 2018 Fedora Release Engineering - 2.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 2.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sun Oct 15 2017 Kalev Lember - 2.8-1 -- Update to 2.8 -- Sync patches with the native package - -* Wed Jul 26 2017 Fedora Release Engineering - 2.7.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jun 20 2017 Kalev Lember - 2.7.1-1 -- Update to 2.7.1 - -* Fri Feb 10 2017 Fedora Release Engineering - 2.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Oct 16 2016 Kalev Lember - 2.7-1 -- Update to 2.7 -- Sync patches with the native package - -* Mon Sep 05 2016 Kalev Lember - 2.6.5-1 -- Update to 2.6.5 -- Don't set group tags - -* Tue May 03 2016 Kalev Lember - 2.6.3-1 -- Update to 2.6.3 -- Sync patches with the native package - -* Thu Feb 04 2016 Fedora Release Engineering - 2.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sun Aug 23 2015 Kalev Lember - 2.6-1 -- Update to 2.6 -- Sync patches with the native package -- Use license macro for license files - -* Wed Jun 17 2015 Fedora Release Engineering - 2.5.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Dec 23 2014 Erik van Pienbroek - 2.5.4-1 -- Update to 2.5.4 -- Fixes RHBZ #1172635 - -* Thu Jul 10 2014 Nicola Fontana - 2.5.3-3 -- Update subpixel rendering patch to 2.5.3 (RHBZ #1118276) - -* Sat Jun 07 2014 Fedora Release Engineering - 2.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Erik van Pienbroek - 2.5.3-1 -- Update to 2.5.3 - -* Sat Sep 7 2013 Erik van Pienbroek - 2.5.0.1-1 -- Update to 2.5.0.1 -- Added BR: mingw32-libpng mingw64-libpng - -* Sat Aug 03 2013 Fedora Release Engineering - 2.4.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sat Jun 15 2013 Erik van Pienbroek - 2.4.12-1 -- Update to 2.4.12 - -* Thu Feb 14 2013 Fedora Release Engineering - 2.4.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jan 16 2013 Erik van Pienbroek - 2.4.11-1 -- Update to 2.4.11 -- Removed unused source tags - -* Wed Oct 24 2012 Nicola Fontana - 2.4.10-2 -- Added static subpackage - -* Sun Oct 07 2012 Kalev Lember - 2.4.10-1 -- Update to 2.4.10 - -* Fri Jul 20 2012 Fedora Release Engineering - 2.4.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sun Jun 03 2012 Erik van Pienbroek - 2.4.9-1 -- Update to 2.4.9 -- Added BR: mingw32-bzip2 mingw64-bzip2 - -* Sat Mar 10 2012 Erik van Pienbroek - 2.4.8-5 -- Added win64 support - -* Fri Mar 09 2012 Kalev Lember - 2.4.8-4 -- Remove .la files - -* Tue Mar 06 2012 Erik van Pienbroek - 2.4.8-3 -- Renamed the source package to mingw-freetype (RHBZ #800380) -- Use mingw macros without leading underscore - -* Mon Feb 27 2012 Erik van Pienbroek - 2.4.8-2 -- Rebuild against the mingw-w64 toolchain - -* Mon Jan 30 2012 Kalev Lember - 2.4.8-1 -- Update to 2.4.8 - -* Fri Jan 13 2012 Fedora Release Engineering - 2.4.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sun Aug 07 2011 Kalev Lember - 2.4.6-1 -- Update to 2.4.6 - -* Sat Jul 30 2011 Kalev Lember - 2.4.5-1 -- Update to 2.4.5 -- Synced patches with Fedora native freetype 2.4.5-2 -- Spec cleanup -- Enable automatic mingw dep extraction -- Create -debuginfo subpackage - -* Tue Feb 08 2011 Fedora Release Engineering - 2.3.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 12 2010 Richard W.M. Jones - 2.3.11-1 -- New upstream version 2.3.11. -- Match patches from Fedora native version. -- Recheck package with rpmlint. - -* Sat Jul 25 2009 Fedora Release Engineering - 2.3.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 2.3.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 20 2009 Richard W.M. Jones - 2.3.8-2 -- Rebuild for mingw32-gcc 4.4 - -* Fri Jan 16 2009 Richard W.M. Jones - 2.3.8-1 -- New upstream version 2.3.8. -- Use the patches from the Fedora native package. -- Disable patented code. -- Don't build the static library. -- Use _smp_mflags. -- BR mingw32-dlfcn (not required, but uses it if installed). -- Add license file to doc section. - -* Tue Jan 13 2009 Richard W.M. Jones - 2.3.7-6 -- Requires pkgconfig. - -* Wed Sep 24 2008 Richard W.M. Jones - 2.3.7-5 -- Rename mingw -> mingw32. - -* Mon Sep 22 2008 Daniel P. Berrange - 2.3.7-4 -- Import patches from rawhide & add docs - -* Sun Sep 21 2008 Richard W.M. Jones - 2.3.7-3 -- Depends on filesystem >= 25. - -* Wed Sep 10 2008 Richard W.M. Jones - 2.3.7-2 -- Fix source URL. -- Remove static libraries. - -* Tue Sep 9 2008 Daniel P. Berrange - 2.3.7-1 -- Initial RPM release diff --git a/sources b/sources deleted file mode 100644 index a9864de..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (freetype-2.13.1.tar.xz) = 045c43f9a3ca33e7d6a98c286895b94ea6ccfbb83851270d1b1861b31ef3ee5a574d8e49c6414c4e14bdfb9276dc49a0677b3be3e4f40ef279dcda99b769b962