Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
a728001d96
!11 decouple from pcre
From: @fly_fzc 
Reviewed-by: @hubin95 
Signed-off-by: @hubin95
2023-04-25 06:39:43 +00:00
fly_fzc
b35953f62c decouple from pcre 2023-04-25 14:16:12 +08:00
openeuler-ci-bot
94bbf7fe11
!10 update version to 2.3.3
From: @fly_fzc 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2023-01-18 07:35:40 +00:00
fly_fzc
2c25421660 update version to 2.3.3 2023-01-18 11:31:25 +08:00
openeuler-ci-bot
cb3b8e1152
!5 【轻量级 PR】:fix bogus date in %changelog
From: @zhangkea 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2022-12-06 06:37:53 +00:00
zhangkea
b8cf6b5d2e fix bogus date in %changelog 2022-06-17 17:16:16 +08:00
openeuler-ci-bot
099436e16c !4 slang delete -Sgit from %autosetup, and delete BuildRequires git
From: @chenyanpanHW
Reviewed-by: @xiezhipeng1
Signed-off-by: @xiezhipeng1
2021-08-20 10:12:57 +00:00
chenyanpanHW
a8c8b9940d
delete -Sgit from %autosetup, and delete BuildRequires git 2021-08-02 10:13:14 +08:00
openeuler-ci-bot
53e839a06a !3 modify yaml file
Merge pull request !3 from Hugel/master
2020-08-11 11:33:00 +08:00
Hugel
e96df9905c modify yaml file 2020-08-11 11:07:19 +08:00
5 changed files with 19 additions and 42 deletions

Binary file not shown.

BIN
slang-2.3.3.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,31 +0,0 @@
commit d338fd6e949ef62e7eac4eb5c024059e02158b06
Author: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed Jul 25 13:07:42 2018 +0200
Replaced memcpy in SLang_getkey
memcpy() is not defined for overlapping buffers, i.e. it may copy bytes
in any direction. As SLMEMMOVE is not defined in slang, replace the
SLMEMCPY call with a for loop.
diff --git a/src/slgetkey.c b/src/slgetkey.c
index 86e7946..d9bc678 100644
--- a/src/slgetkey.c
+++ b/src/slgetkey.c
@@ -40,13 +40,13 @@ unsigned int SLang_getkey (void)
if (SLang_Input_Buffer_Len)
{
- unsigned int imax;
+ unsigned int i, imax;
ch = (unsigned int) *SLang_Input_Buffer;
SLang_Input_Buffer_Len--;
imax = SLang_Input_Buffer_Len;
- SLMEMCPY ((char *) SLang_Input_Buffer,
- (char *) (SLang_Input_Buffer + 1), imax);
+ for (i = 0; i < imax; i++)
+ SLang_Input_Buffer[i] = SLang_Input_Buffer[i + 1];
}
else if (SLANG_GETKEY_ERROR == (ch = _pSLsys_getkey ())) return ch;

View File

@ -1,8 +1,8 @@
%bcond_with oniguruma %bcond_with oniguruma
Name: slang Name: slang
Version: 2.3.2 Version: 2.3.3
Release: 8 Release: 2
Summary: An interpreted language and programing library Summary: An interpreted language and programing library
License: GPLv2+ License: GPLv2+
URL: https://www.jedsoft.org/slang/ URL: https://www.jedsoft.org/slang/
@ -11,10 +11,9 @@ Source0: https://www.jedsoft.org/releases/slang/%{name}-%{version}.tar.bz2
Provides: %{name}-slsh = %{version}-%{release} Provides: %{name}-slsh = %{version}-%{release}
Obsoletes: %{name}-slsh < %{version}-%{release} Obsoletes: %{name}-slsh < %{version}-%{release}
Patch6000: slang-getkey-memmove.patch Patch0: slang-sighuptest.patch
Patch6001: slang-sighuptest.patch
BuildRequires: gcc libpng-devel pcre-devel zlib-devel git BuildRequires: gcc libpng-devel zlib-devel
%description %description
S-Lang is a multi-platform programmer's library designed to allow S-Lang is a multi-platform programmer's library designed to allow
@ -37,12 +36,12 @@ BuildArch: noarch
Help files for %{name} Help files for %{name}
%prep %prep
%autosetup -n %{name}-%{version} -p1 -Sgit %autosetup -n %{name}-%{version} -p1
sed -i '/^INSTALL_MODULE=/s/_DATA//' configure sed -i '/^INSTALL_MODULE=/s/_DATA//' configure
%build %build
%configure --with-{pcre,png,z}lib=%{_libdir} --with-{pcre,png,z}inc=%{_includedir} %configure --with-{png,z}lib=%{_libdir} --with-{png,z}inc=%{_includedir} --without-pcre
make RPATH="" install_doc_dir=%{_pkgdocdir} all make RPATH="" install_doc_dir=%{_pkgdocdir} all
@ -84,14 +83,23 @@ make check
%{_mandir}/man1/slsh.1* %{_mandir}/man1/slsh.1*
%changelog %changelog
* Tue Apr 25 2023 fuanan <fuanan3@h-partners.com> - 2.3.3-2
- decouple from pcre
* Wed Jan 18 2023 fuanan <fuanan3@h-partners.com> - 2.3.3-1
- update version to 2.3.3
* Mon Aug 02 2021 chenyanpanHW <chenyanpan@huawei.com> - 2.3.2-9
- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
* Wed Dec 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-8 * Wed Dec 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-8
- Add provides of slang-slsh - Add provides of slang-slsh
* Thu Nov 21 2019 fangyufa <fangyufa1@huawei.com> - 2.3.2-7 * Thu Nov 21 2019 fangyufa <fangyufa1@huawei.com> - 2.3.2-7
- add buildrequires of git for x86_64 build - add buildrequires of git for x86_64 build
* Mon Sep 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-6 * Tue Sep 24 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-6
- Remove unnecessary info in spec - Remove unnecessary info in spec
* Tue Sep 16 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-5 * Mon Sep 16 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.3.2-5
- Package init - Package init

View File

@ -1,4 +1,4 @@
version_control: git version_control: git
src_repo: git://git.jedsoft.org/git/slang.git src_repo: git://git.jedsoft.org/git/slang.git
tag_prefix: ^v tag_prefix: "^v"
seperator: seperator: "."