public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Sandro Mani <manisandro@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/mingw-graphite2] rawhide: Update to 1.3.15
Date: Sat, 06 Jun 2026 08:14:21 GMT [thread overview]
Message-ID: <178073366119.1.8369459185719025526.rpms-mingw-graphite2-ff08378ada37@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/mingw-graphite2
Branch : rawhide
Commit : ff08378ada37a7b9cde2e0b49a5eb71939d04235
Author : Sandro Mani <manisandro@gmail.com>
Date : 2026-06-06T10:14:12+02:00
Stats : +11/-371 in 10 file(s)
URL : https://src.fedoraproject.org/rpms/mingw-graphite2/c/ff08378ada37a7b9cde2e0b49a5eb71939d04235?branch=rawhide
Log:
Update to 1.3.15
---
diff --git a/.gitignore b/.gitignore
index bb3737f..75a758f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/graphite2-1.3.10.tgz
/graphite2-1.3.13.tgz
/graphite2-1.3.14.tgz
+/graphite2-1.3.15.tgz
diff --git a/graphite2_cmakelibsuffix.patch b/graphite2_cmakelibsuffix.patch
deleted file mode 100644
index 34c5364..0000000
--- a/graphite2_cmakelibsuffix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -rupN graphite2-1.3.14/CMakeLists.txt graphite2-1.3.14-new/CMakeLists.txt
---- graphite2-1.3.14/CMakeLists.txt 2025-07-17 17:33:50.824583866 +0200
-+++ graphite2-1.3.14-new/CMakeLists.txt 2025-07-17 17:34:44.948954687 +0200
-@@ -90,9 +90,9 @@ endif()
-
- set(version 3.0.1)
- set(prefix ${CMAKE_INSTALL_PREFIX})
--set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-+set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
- set(includedir ${CMAKE_INSTALL_PREFIX}/include)
-
- configure_file(graphite2.pc.in graphite2.pc)
-
--install(FILES ${PROJECT_BINARY_DIR}/graphite2.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
-+install(FILES ${PROJECT_BINARY_DIR}/graphite2.pc DESTINATION lib/pkgconfig)
-diff -rupN graphite2-1.3.14/src/CMakeLists.txt graphite2-1.3.14-new/src/CMakeLists.txt
---- graphite2-1.3.14/src/CMakeLists.txt 2025-07-17 17:33:50.871075286 +0200
-+++ graphite2-1.3.14-new/src/CMakeLists.txt 2025-07-17 17:35:05.296412648 +0200
-@@ -171,7 +171,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linu
- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
- endif ()
- set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
-- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
-+ CREATE_LIBTOOL_FILE(graphite2 "/lib")
- endif()
-
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-@@ -186,7 +186,7 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Darw
- include(Graphite)
- nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)
- set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")
-- CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")
-+ CREATE_LIBTOOL_FILE(graphite2 "/lib")
- endif()
-
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
-@@ -197,5 +197,5 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Wind
- endif()
-
-
--install(TARGETS graphite2 graphite2_static EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
-+install(TARGETS graphite2 graphite2_static EXPORT graphite2 LIBRARY DESTINATION lib ARCHIVE DESTINATION lib PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
- install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
diff --git a/graphite2_cmakever.patch b/graphite2_cmakever.patch
deleted file mode 100644
index 94cb207..0000000
--- a/graphite2_cmakever.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -rupN graphite2-1.3.14/CMakeLists.txt graphite2-1.3.14-new/CMakeLists.txt
---- graphite2-1.3.14/CMakeLists.txt 2025-07-17 17:31:12.115418075 +0200
-+++ graphite2-1.3.14-new/CMakeLists.txt 2025-07-17 17:31:54.848174770 +0200
-@@ -1,4 +1,4 @@
--CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
- cmake_policy(SET CMP0012 NEW)
- include(TestBigEndian)
- find_package(PythonInterp 3.6)
-diff -rupN graphite2-1.3.14/gr2fonttest/CMakeLists.txt graphite2-1.3.14-new/gr2fonttest/CMakeLists.txt
---- graphite2-1.3.14/gr2fonttest/CMakeLists.txt 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/gr2fonttest/CMakeLists.txt 2025-07-17 17:31:59.480148259 +0200
-@@ -1,4 +1,4 @@
--CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
-
- project(gr2fonttest)
-
-diff -rupN graphite2-1.3.14/src/CMakeLists.txt graphite2-1.3.14-new/src/CMakeLists.txt
---- graphite2-1.3.14/src/CMakeLists.txt 2025-07-17 17:31:12.163834566 +0200
-+++ graphite2-1.3.14-new/src/CMakeLists.txt 2025-07-17 17:31:48.808271619 +0200
-@@ -19,7 +19,7 @@
- # Suite 500, Boston, MA 02110-1335, USA or visit their web page on the
- # internet at http://www.fsf.org/licenses/lgpl.html.
-
--CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
- project(graphite2_core)
- cmake_policy(SET CMP0012 NEW)
- INCLUDE(CheckCXXSourceCompiles)
-diff -rupN graphite2-1.3.14/tests/bittwiddling/CMakeLists.txt graphite2-1.3.14-new/tests/bittwiddling/CMakeLists.txt
---- graphite2-1.3.14/tests/bittwiddling/CMakeLists.txt 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/tests/bittwiddling/CMakeLists.txt 2025-07-17 17:32:03.998697261 +0200
-@@ -1,4 +1,4 @@
--CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
- project(bits)
- include(Graphite)
- include_directories(${graphite2_core_SOURCE_DIR})
-diff -rupN graphite2-1.3.14/tests/json/CMakeLists.txt graphite2-1.3.14-new/tests/json/CMakeLists.txt
---- graphite2-1.3.14/tests/json/CMakeLists.txt 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/tests/json/CMakeLists.txt 2025-07-17 17:32:12.821882783 +0200
-@@ -1,4 +1,4 @@
--CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
- project(jsontest)
- include(Graphite)
- include_directories(${graphite2_core_SOURCE_DIR})
-diff -rupN graphite2-1.3.14/tests/sparsetest/CMakeLists.txt graphite2-1.3.14-new/tests/sparsetest/CMakeLists.txt
---- graphite2-1.3.14/tests/sparsetest/CMakeLists.txt 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/tests/sparsetest/CMakeLists.txt 2025-07-17 17:32:17.143588516 +0200
-@@ -1,4 +1,4 @@
--CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
- project(sparsetest)
- include(Graphite)
- include_directories(${graphite2_core_SOURCE_DIR})
-diff -rupN graphite2-1.3.14/tests/utftest/CMakeLists.txt graphite2-1.3.14-new/tests/utftest/CMakeLists.txt
---- graphite2-1.3.14/tests/utftest/CMakeLists.txt 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/tests/utftest/CMakeLists.txt 2025-07-17 17:32:08.538699371 +0200
-@@ -1,4 +1,4 @@
--CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
-+CMAKE_MINIMUM_REQUIRED(VERSION 3.5 FATAL_ERROR)
- project(utftest)
- include(Graphite)
- include_directories(${graphite2_core_SOURCE_DIR})
diff --git a/graphite2_gcc15.patch b/graphite2_gcc15.patch
deleted file mode 100644
index 153a676..0000000
--- a/graphite2_gcc15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN graphite2-1.3.14/tests/featuremap/featuremaptest.cpp graphite2-1.3.14-new/tests/featuremap/featuremaptest.cpp
---- graphite2-1.3.14/tests/featuremap/featuremaptest.cpp 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/tests/featuremap/featuremaptest.cpp 2025-07-17 18:12:51.211724628 +0200
-@@ -20,6 +20,7 @@
- internet at http://www.fsf.org/licenses/lgpl.html.
- */
- #include <cassert>
-+#include <cstdint>
- #include <cstdlib>
- #include <fstream>
- #include <iostream>
diff --git a/mingw-graphite2.spec b/mingw-graphite2.spec
index 36d2c4b..71b4c7e 100644
--- a/mingw-graphite2.spec
+++ b/mingw-graphite2.spec
@@ -3,41 +3,26 @@
%global pkgname graphite2
Name: mingw-%{pkgname}
-Version: 1.3.14
-Release: 17%{?dist}
+Version: 1.3.15
+Release: 1%{?dist}
Summary: MinGW Windows %{pkgname} library
-# Automatically converted from old format: LGPLv2+ - review is highly recommended.
-License: LicenseRef-Callaway-LGPLv2+
+# As per COPYING file this library is tri-licensed
+License: LGPL-2.1-or-later OR MPL-2.0 OR GPL-2.0-or-later
URL: https://github.com/silnrsi/graphite
Source0: https://github.com/silnrsi/graphite/releases/download/%{version}/%{pkgname}-%{version}.tgz
-# https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-graphite2/001-graphite2-1.3.8-win64.patch
-Patch0: mingw-graphite2_win64.patch
-# https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-graphite2/002-graphite2-1.2.1-pkgconfig.patch
-Patch1: mingw-graphite2_pkgconfig.patch
-# https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-graphite2/003-graphite2-1.3.9-staticbuild.patch
-Patch2: mingw-graphite2_staticbuild.patch
-# https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-graphite2/004-graphite2-1.3.8-dllimport-fix.patch
-Patch3: mingw-graphite2_dllimport-fix.patch
-# Drop use of LIB_SUFFIX
-Patch4: graphite2_cmakelibsuffix.patch
-# Increase minimum cmake version
-Patch5: graphite2_cmakever.patch
-# Fix build with gcc15
-Patch6: graphite2_gcc15.patch
-
BuildArch: noarch
BuildRequires: make
BuildRequires: cmake
-BuildRequires: mingw32-filesystem >= 95
+BuildRequires: mingw32-filesystem
BuildRequires: mingw32-gcc-c++
BuildRequires: mingw32-freetype
-BuildRequires: mingw64-filesystem >= 95
+BuildRequires: mingw64-filesystem
BuildRequires: mingw64-gcc-c++
BuildRequires: mingw64-freetype
@@ -58,11 +43,6 @@ Summary: MinGW Windows %{pkgname} library
%description -n mingw32-%{pkgname}
MinGW Windows %{pkgname} library.
-%package -n mingw32-%{pkgname}-static
-Summary: Static version of the MinGW Windows %{pkgname} library
-
-%description -n mingw32-%{pkgname}-static
-Static version of the MinGW Windows %{pkgname} library.
# Win64
%package -n mingw64-%{pkgname}
@@ -71,12 +51,6 @@ Summary: MinGW Windows %{pkgname} library
%description -n mingw64-%{pkgname}
MinGW Windows %{pkgname} library.
-%package -n mingw64-%{pkgname}-static
-Summary: Static version of the MinGW Windows %{pkgname} library
-
-%description -n mingw64-%{pkgname}-static
-Static version of the MinGW Windows %{pkgname} library.
-
%{?mingw_debug_package}
@@ -106,10 +80,6 @@ rm -rf %{buildroot}%{mingw64_datadir}
%{mingw32_libdir}/pkgconfig/%{pkgname}.pc
%{mingw32_includedir}/%{pkgname}/
-%files -n mingw32-%{pkgname}-static
-%license LICENSE COPYING
-%{mingw32_libdir}/lib%{pkgname}.a
-
# Win64
%files -n mingw64-%{pkgname}
%license LICENSE COPYING
@@ -119,12 +89,11 @@ rm -rf %{buildroot}%{mingw64_datadir}
%{mingw64_libdir}/pkgconfig/%{pkgname}.pc
%{mingw64_includedir}/%{pkgname}/
-%files -n mingw64-%{pkgname}-static
-%license LICENSE COPYING
-%{mingw64_libdir}/lib%{pkgname}.a
-
%changelog
+* Sat Jun 06 2026 Sandro Mani <manisandro@gmail.com> - 1.3.15-1
+- Update to 1.3.15
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.14-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
diff --git a/mingw-graphite2_dllimport-fix.patch b/mingw-graphite2_dllimport-fix.patch
deleted file mode 100644
index 3102c58..0000000
--- a/mingw-graphite2_dllimport-fix.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -rupN --no-dereference graphite2-1.3.14/include/graphite2/Log.h graphite2-1.3.14-new/include/graphite2/Log.h
---- graphite2-1.3.14/include/graphite2/Log.h 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/include/graphite2/Log.h 2020-04-08 21:13:38.085284960 +0200
-@@ -56,7 +56,7 @@ typedef enum {
- * @param face the gr_face whose segments you want to log to the given file
- * @param log_path a utf8 encoded file name and path to log to.
- */
--GR2_API bool gr_start_logging(gr_face * face, const char *log_path);
-+GR2_API bool gr_start_logging(GR_MAYBE_UNUSED gr_face * face, const char *log_path);
-
-
- /** Stop logging on the given face. This will close the log file created by
-@@ -64,7 +64,7 @@ GR2_API bool gr_start_logging(gr_face *
- *
- * @param face the gr_face whose segments you want to stop logging
- */
--GR2_API void gr_stop_logging(gr_face * face);
-+GR2_API void gr_stop_logging(GR_MAYBE_UNUSED gr_face * face);
-
- /** Start logging to a FILE object.
- * This function is deprecated as of 1.2.0, use the _face versions instead.
-diff -rupN --no-dereference graphite2-1.3.14/include/graphite2/Types.h graphite2-1.3.14-new/include/graphite2/Types.h
---- graphite2-1.3.14/include/graphite2/Types.h 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/include/graphite2/Types.h 2020-04-08 21:13:38.086284962 +0200
-@@ -40,6 +40,34 @@ enum gr_encform {
- gr_utf8 = 1/*sizeof(uint8)*/, gr_utf16 = 2/*sizeof(uint16)*/, gr_utf32 = 4/*sizeof(uint32)*/
- };
-
-+#if defined(__GNUC__) || defined(__clang__)
-+#define GR_MAYBE_UNUSED __attribute__((unused))
-+#else
-+#define GR_MAYBE_UNUSED
-+#endif
-+
-+#ifndef __has_cpp_attribute
-+# define __has_cpp_attribute(x) 0
-+#endif
-+
-+#if defined(__clang__) && __cplusplus >= 201103L
-+ /* clang's fallthrough annotations are only available starting in C++11. */
-+ #define GR_FALLTHROUGH [[clang::fallthrough]]
-+#elif defined(_MSC_VER)
-+ /*
-+ * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
-+ * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
-+ */
-+ #include <sal.h>
-+ #define GR_FALLTHROUGH __fallthrough
-+#else
-+ #define GR_FALLTHROUGH /* fallthrough */
-+#endif
-+
-+#ifdef _MSC_VER
-+#pragma warning(disable: 4800)
-+#pragma warning(disable: 4355)
-+#endif
-
- // Define API function declspec/attributes and how each supported compiler or OS
- // allows us to specify them.
-diff -rupN --no-dereference graphite2-1.3.14/src/inc/Main.h graphite2-1.3.14-new/src/inc/Main.h
---- graphite2-1.3.14/src/inc/Main.h 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/src/inc/Main.h 2020-04-08 21:13:38.086284962 +0200
-@@ -165,35 +165,3 @@ inline T max(const T a, const T b)
- void operator delete (void *, void *) throw() {} \
- void operator delete[] (void * p)throw() { free(p); } \
- void operator delete[] (void *, void *) throw() {}
--
--#if defined(__GNUC__) || defined(__clang__)
--#define GR_MAYBE_UNUSED __attribute__((unused))
--#else
--#define GR_MAYBE_UNUSED
--#endif
--
--#ifndef __has_cpp_attribute
--# define __has_cpp_attribute(x) 0
--#endif
--
--#if __has_cpp_attribute(clang::fallthrough)
--# define GR_FALLTHROUGH [[clang::fallthrough]]
--#elif __has_cpp_attribute(gnu::fallthrough)
--# define GR_FALLTHROUGH [[gnu::fallthrough]]
--#elif defined(_MSC_VER)
-- /*
-- * MSVC's __fallthrough annotations are checked by /analyze (Code Analysis):
-- * https://msdn.microsoft.com/en-us/library/ms235402%28VS.80%29.aspx
-- */
-- #include <sal.h>
-- #define GR_FALLTHROUGH __fallthrough
--#elif __GNUC__ >= 7
-- #define GR_FALLTHROUGH __attribute__ ((fallthrough))
--#else
-- #define GR_FALLTHROUGH /* fallthrough */
--#endif
--
--#ifdef _MSC_VER
--#pragma warning(disable: 4800)
--#pragma warning(disable: 4355)
--#endif
diff --git a/mingw-graphite2_pkgconfig.patch b/mingw-graphite2_pkgconfig.patch
deleted file mode 100644
index b5187e1..0000000
--- a/mingw-graphite2_pkgconfig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -rupN --no-dereference graphite2-1.3.14/CMakeLists.txt graphite2-1.3.14-new/CMakeLists.txt
---- graphite2-1.3.14/CMakeLists.txt 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/CMakeLists.txt 2020-04-08 21:13:38.009284788 +0200
-@@ -89,6 +89,7 @@ if (NOT GRAPHITE2_NFILEFACE)
- endif()
-
- set(version 3.0.1)
-+set(prefix ${CMAKE_INSTALL_PREFIX})
- set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
- set(includedir ${CMAKE_INSTALL_PREFIX}/include)
-
-diff -rupN --no-dereference graphite2-1.3.14/graphite2.pc.in graphite2-1.3.14-new/graphite2.pc.in
---- graphite2-1.3.14/graphite2.pc.in 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/graphite2.pc.in 2020-04-08 21:13:38.009284788 +0200
-@@ -1,3 +1,7 @@
-+prefix=${prefix}
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+includedir=${prefix}/include
-
- Name: Graphite2
- Description: Font rendering engine for Complex Scripts
diff --git a/mingw-graphite2_staticbuild.patch b/mingw-graphite2_staticbuild.patch
deleted file mode 100644
index 3dae7db..0000000
--- a/mingw-graphite2_staticbuild.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -rupN --no-dereference graphite2-1.3.14/src/CMakeLists.txt graphite2-1.3.14-new/src/CMakeLists.txt
---- graphite2-1.3.14/src/CMakeLists.txt 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/src/CMakeLists.txt 2020-04-08 21:13:38.046284872 +0200
-@@ -102,6 +102,46 @@ set_target_properties(graphite2 PROPERTI
- LT_VERSION_REVISION ${GRAPHITE_API_REVISION}
- LT_VERSION_AGE ${GRAPHITE_API_AGE})
-
-+add_library(graphite2_static STATIC
-+ ${GRAPHITE2_VM_TYPE}_machine.cpp
-+ gr_char_info.cpp
-+ gr_features.cpp
-+ gr_face.cpp
-+ gr_font.cpp
-+ gr_logging.cpp
-+ gr_segment.cpp
-+ gr_slot.cpp
-+ CmapCache.cpp
-+ Code.cpp
-+ Collider.cpp
-+ Decompressor.cpp
-+ Face.cpp
-+ FeatureMap.cpp
-+ Font.cpp
-+ GlyphFace.cpp
-+ GlyphCache.cpp
-+ Intervals.cpp
-+ Justifier.cpp
-+ NameTable.cpp
-+ Pass.cpp
-+ Position.cpp
-+ Segment.cpp
-+ Silf.cpp
-+ Slot.cpp
-+ Sparse.cpp
-+ TtfUtil.cpp
-+ UtfCodec.cpp
-+ ${FILEFACE}
-+ ${TRACING})
-+
-+set_target_properties(graphite2_static PROPERTIES PUBLIC_HEADER "${GRAPHITE_HEADERS}"
-+ SOVERSION ${GRAPHITE_SO_VERSION}
-+ VERSION ${GRAPHITE_VERSION}
-+ LT_VERSION_CURRENT ${GRAPHITE_API_CURRENT}
-+ LT_VERSION_REVISION ${GRAPHITE_API_REVISION}
-+ LT_VERSION_AGE ${GRAPHITE_API_AGE}
-+ OUTPUT_NAME graphite2)
-+
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- set_target_properties(graphite2 PROPERTIES
- COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden"
-@@ -152,8 +192,10 @@ endif()
- if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
- set_target_properties(graphite2 PROPERTIES
- COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_EXPORTING")
-+ set_target_properties(graphite2_static PROPERTIES
-+ COMPILE_DEFINITIONS "_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;UNICODE;GRAPHITE2_STATIC")
- endif()
-
-
--install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
-+install(TARGETS graphite2 graphite2_static EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
- install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
diff --git a/mingw-graphite2_win64.patch b/mingw-graphite2_win64.patch
deleted file mode 100644
index 9203051..0000000
--- a/mingw-graphite2_win64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -rupN --no-dereference graphite2-1.3.14/src/inc/json.h graphite2-1.3.14-new/src/inc/json.h
---- graphite2-1.3.14/src/inc/json.h 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/src/inc/json.h 2020-04-08 21:13:37.972284705 +0200
-@@ -87,6 +87,10 @@ public:
- json & operator << (number) throw();
- json & operator << (integer) throw();
- json & operator << (integer_u) throw();
-+#ifdef _WIN32
-+ json & operator << (unsigned __int64 d) throw();
-+ json & operator << (__int64 d) throw();
-+#endif
- json & operator << (boolean) throw();
- json & operator << (std::nullptr_t) throw();
- json & operator << (_context_t) throw();
-diff -rupN --no-dereference graphite2-1.3.14/src/json.cpp graphite2-1.3.14-new/src/json.cpp
---- graphite2-1.3.14/src/json.cpp 2020-04-01 04:53:13.000000000 +0200
-+++ graphite2-1.3.14-new/src/json.cpp 2020-04-08 21:13:37.972284705 +0200
-@@ -141,6 +141,10 @@ json & json::operator << (json::number f
- }
- json & json::operator << (json::integer d) throw() { context(seq); fprintf(_stream, FORMAT_INTMAX, intmax_t(d)); return *this; }
- json & json::operator << (json::integer_u d) throw() { context(seq); fprintf(_stream, FORMAT_UINTMAX, uintmax_t(d)); return *this; }
-+#ifdef _WIN32
-+json & json::operator << (unsigned __int64 d) throw() { context(seq); fprintf(_stream, "%I64", d); return *this; }
-+json & json::operator << (__int64 d) throw() { context(seq); fprintf(_stream, "%I64", d); return *this; }
-+#endif
- json & json::operator << (json::boolean b) throw() { context(seq); fputs(b ? "true" : "false", _stream); return *this; }
- json & json::operator << (std::nullptr_t) throw() { context(seq); fputs("null",_stream); return *this; }
-
diff --git a/sources b/sources
index 1fb76b6..a967b6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (graphite2-1.3.14.tgz) = 14b5eb2ba8158b8b62ffa7fb142100a0af1de0f0c45b2673801b636714a106b46fcd423b05c722d963c9543fafcf10fec811975308211a54f20a3ba322d7b295
+SHA512 (graphite2-1.3.15.tgz) = 855262e7c9fb54a64c54282abea96ef68ce760c6b9b108df6c706ed28e1ad03cf9c2fd88470622c1138e5eaa3f2a9539911415c3d313795f4b06b2d9d70b34e1
reply other threads:[~2026-06-06 8:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178073366119.1.8369459185719025526.rpms-mingw-graphite2-ff08378ada37@fedoraproject.org \
--to=manisandro@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox