Compare commits

..

No commits in common. "c9" and "c8s" have entirely different histories.
c9 ... c8s

6 changed files with 15 additions and 70 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/libfreehand-0.1.2.tar.xz SOURCES/libfreehand-0.1.2.tar.xz
/libfreehand-0.1.2.tar.xz

View File

@ -1 +0,0 @@
f945b23b7801a3601998973028a054ee379967cb SOURCES/libfreehand-0.1.2.tar.xz

View File

@ -1,29 +0,0 @@
From af3197f795625f5188602073205a34369698b6df Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Fri, 4 Oct 2019 01:46:12 +0200
Subject: [PATCH] Add missing semicolon to fix build with icu 65.1
Change-Id: I7a0b0d600e9f7770245a7485813a944bfac4f088
Reviewed-on: https://gerrit.libreoffice.org/80224
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Miklos Vajna <vmiklos@collabora.com>
---
src/lib/libfreehand_utils.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/libfreehand_utils.cpp b/src/lib/libfreehand_utils.cpp
index 439c457..32f23e0 100644
--- a/src/lib/libfreehand_utils.cpp
+++ b/src/lib/libfreehand_utils.cpp
@@ -162,7 +162,7 @@ void libfreehand::_appendUTF16(librevenge::RVNGString &text, std::vector<unsigne
while (j < length)
{
UChar32 c;
- U16_NEXT(s, j, length, c)
+ U16_NEXT(s, j, length, c);
unsigned char outbuf[U8_MAX_LENGTH+1];
int i = 0;
U8_APPEND_UNSAFE(&outbuf[0], i, c);
--
2.23.0

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -2,7 +2,7 @@
Name: libfreehand Name: libfreehand
Version: 0.1.2 Version: 0.1.2
Release: 11%{?dist} Release: 2%{?dist}
Summary: A library for import of Macromedia/Adobe FreeHand documents Summary: A library for import of Macromedia/Adobe FreeHand documents
License: MPLv2.0 License: MPLv2.0
@ -11,20 +11,14 @@ Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: gperf BuildRequires: gperf
BuildRequires: help2man BuildRequires: help2man
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
BuildRequires: pkgconfig(cppunit) BuildRequires: pkgconfig(cppunit)
BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(librevenge-0.0)
BuildRequires: pkgconfig(librevenge-generators-0.0)
BuildRequires: pkgconfig(librevenge-stream-0.0)
BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
BuildRequires: make
Patch0: 0001-Add-missing-semicolon-to-fix-build-with-icu-65.1.patch
%description %description
libfreehand is library providing ability to interpret and import libfreehand is library providing ability to interpret and import
@ -62,11 +56,11 @@ sed -i \
-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
libtool libtool
%make_build make %{?_smp_mflags}
%install %install
%make_install make install DESTDIR=%{buildroot}
rm -f %{buildroot}/%{_libdir}/*.la rm -f %{buildroot}/%{_libdir}/*.la
# we install API docs directly from build # we install API docs directly from build
rm -rf %{buildroot}/%{_docdir}/%{name} rm -rf %{buildroot}/%{_docdir}/%{name}
@ -79,11 +73,13 @@ done
install -m 0755 -d %{buildroot}/%{_mandir}/man1 install -m 0755 -d %{buildroot}/%{_mandir}/man1
install -m 0644 fh2*.1 %{buildroot}/%{_mandir}/man1 install -m 0644 fh2*.1 %{buildroot}/%{_mandir}/man1
%ldconfig_scriptlets %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%check %check
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
%make_build check make %{?_smp_mflags} check
%files %files
%doc AUTHORS %doc AUTHORS
@ -109,35 +105,6 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PA
%{_mandir}/man1/fh2text.1* %{_mandir}/man1/fh2text.1*
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.1.2-11
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.1.2-10
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.1.2-7
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-2 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (libfreehand-0.1.2.tar.xz) = 4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963