!10 [sync] PR-8: Update to 4.1

From: @openeuler-sync-bot 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
This commit is contained in:
openeuler-ci-bot 2022-08-23 08:40:40 +00:00 committed by Gitee
commit 14cb0b4623
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 18 additions and 30 deletions

View File

@ -1,16 +0,0 @@
diff -up highlight-3.42/src/core/platform_fs.cpp.list-available-langs highlight-3.42/src/core/platform_fs.cpp
--- highlight-3.42/src/core/platform_fs.cpp.list-available-langs 2019-01-11 11:42:30.948013206 +0100
+++ highlight-3.42/src/core/platform_fs.cpp 2019-01-11 11:44:25.206011626 +0100
@@ -222,8 +222,10 @@ void getFileNames ( const string &direct
if ( errno ) return;
// sort the current entries for fileName
- if ( firstEntry < fileName.size() )
- sort ( &fileName[firstEntry], &fileName[fileName.size() ] );
+ // https://gitlab.com/saalen/highlight/issues/84
+ // coredump with GLIBCXX_ASSERTIONS compiler option, use iterators if sort is needed
+ //if ( firstEntry < fileName.size() )
+ // sort ( &fileName[firstEntry], &fileName[fileName.size() ] );
// recurse into sub directories
// if not doing recursive, subDirectory is empty

Binary file not shown.

BIN
highlight-4.1.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,17 +1,17 @@
Name: highlight
Summary: Universal source code to formatted text converter
Version: 3.42
Version: 4.1
Release: 1
Group: Development/Tools
License: GPLv3
URL: http://www.andre-simon.de/
Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
Patch01: highlight-3.42-list-available-langs.patch
BuildRequires: qt5-qtbase-devel
BuildRequires: lua-devel, boost-devel
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++ make
%{?filter_setup:
%filter_from_provides /^perl(/d;
@ -28,37 +28,38 @@ Language descriptions are configurable and support regular expressions.
The utility offers indentation and reformatting capabilities.
It is easily possible to create new language definitions and colour themes.
%package gui
%package gui
Summary: GUI for the hihghlight source code formatter
Requires: %{name} = %{version}-%{release}
%description gui
%description gui
A Qt-based GUI for the highlight source code formatter source.
%prep
%autosetup -p1
%autosetup
%build
CFLAGS="$CFLAGS -fPIC %{optflags}"; export CFLAGS
CXXFLAGS="$CXXFLAGS -fPIC %{optflags}"; export CXXFLAGS
LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS
# Disable paralell builds, atempt to fixes FTBFS
#%make_build all gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
%make_build all gui CFLAGS="${CFLAGS}" \
# disabled paralell builds to fix FTBFS on rawhide & highlight 3.52+
#make_build all gui CFLAGS="${CFLAGS}" \
%{__make} all gui CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}" \
LFLAGS="-Wl,-O1 ${LDFLAGS}" \
PREFIX="%{_prefix}" \
conf_dir="%{_sysconfdir}/highlight/" \
QMAKE="%{_qt5_qmake}" \
QMAKE_STRIP=
%install
%make_install
%make_install PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/"
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
make install-gui DESTDIR=$RPM_BUILD_ROOT
make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/"
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
@ -70,17 +71,20 @@ desktop-file-install \
%{_bindir}/highlight
%{_datadir}/highlight/
%{_mandir}/man1/highlight.1*
%{_mandir}/man5/filetypes.conf.5*
%config(noreplace) %{_sysconfdir}/highlight/
%doc ChangeLog AUTHORS README* TODO extras/
%doc ChangeLog* AUTHORS README* extras/
%license COPYING
%files gui
%{_bindir}/highlight-gui
%{_datadir}/applications/highlight.desktop
%{_datadir}/pixmaps/highlight.xpm
%{_datadir}/icons/hicolor/256x256/apps/highlight.png
%changelog
* Thu Jul 28 2022 jiangxinyu <jiangxinyu@kylinos.cn> - 4.1-1
- Update to 4.1
* Feb Aug 17 2021 Python_Bot <Python_Bot@openeuler.org> - 3.42-1
- Init Package