diff --git a/consoleet-utils.changes b/consoleet-utils.changes index 8cc6d6f..1e5a1a0 100644 --- a/consoleet-utils.changes +++ b/consoleet-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 1 10:51:10 UTC 2022 - Jan Engelhardt + +- Add libhx.patch + ------------------------------------------------------------------- Mon Nov 21 11:08:57 UTC 2022 - Jan Engelhardt diff --git a/consoleet-utils.spec b/consoleet-utils.spec index 311100a..9bd5c48 100644 --- a/consoleet-utils.spec +++ b/consoleet-utils.spec @@ -27,10 +27,11 @@ URL: https://inai.de/projects/consoleet/ Source: https://inai.de/files/consoleet/%name-%version.tar.zst Source2: https://inai.de/files/consoleet/%name-%version.tar.asc Source3: %name.keyring +Patch1: libhx.patch BuildRequires: gcc-c++ BuildRequires: zstd BuildRequires: pkgconfig >= 0.21 -BuildRequires: pkgconfig(libHX) >= 4.2 +BuildRequires: pkgconfig(libHX) >= 3.22 Conflicts: hxtools < 20200310 Obsoletes: vfontas < 20221121 Provides: vfontas = 20221121 @@ -46,9 +47,16 @@ high-quality mode that upscales based on outline rather than pixel blocks, setting it apart from scalers like xBRZ or potrace. %prep +%if 0%{?suse_version} < 1550 +%setup -Tcq +pushd .. && tar --use=zstd -xf %{S:0} && popd +%patch -P 1 -p1 +%else %autosetup -p1 +%endif %build +autoreconf -fi %configure %make_build diff --git a/libhx.patch b/libhx.patch new file mode 100644 index 0000000..6653fff --- /dev/null +++ b/libhx.patch @@ -0,0 +1,25 @@ +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +Index: consoleet-utils-1.1/configure.ac +=================================================================== +--- consoleet-utils-1.1.orig/configure.ac ++++ consoleet-utils-1.1/configure.ac +@@ -2,7 +2,7 @@ AC_INIT([consoleet-utils], [1.1]) + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_HEADERS([config.h]) + AC_PROG_INSTALL +-AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax no-dist-gzip dist-zstd]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax]) + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AC_PROG_CXX + +@@ -15,6 +15,6 @@ AC_SUBST([regular_CPPFLAGS]) + AC_SUBST([regular_CFLAGS]) + AC_SUBST([regular_CXXFLAGS]) + +-PKG_CHECK_MODULES([libHX], [libHX >= 4.2]) ++PKG_CHECK_MODULES([libHX], [libHX >= 2.0]) + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT