[packages/smalltalk] - updated to 2.3.5
baggins
baggins at pld-linux.org
Sat Aug 3 13:30:05 CEST 2013
commit bb5ff558f6c19382cbd6692bd0418c85761440b5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Aug 3 13:29:54 2013 +0200
- updated to 2.3.5
gmp5.patch | 84 ----------------------------------------------------------
smalltalk.spec | 37 ++++++++++++++++++++------
2 files changed, 29 insertions(+), 92 deletions(-)
---
diff --git a/smalltalk.spec b/smalltalk.spec
index e7d3791..b794a1a 100644
--- a/smalltalk.spec
+++ b/smalltalk.spec
@@ -8,16 +8,15 @@
Summary: GNU smalltalk
Summary(pl.UTF-8): GNU smalltalk
Name: smalltalk
-Version: 3.1
-Release: 5
+Version: 3.2.5
+Release: 1
License: GPL
Group: Development/Languages
-Source0: ftp://ftp.gnu.org/pub/gnu/smalltalk/%{name}-%{version}.tar.gz
-# Source0-md5: fb4630a86fc47c893cf9eb9adccd4851
+Source0: ftp://ftp.gnu.org/pub/gnu/smalltalk/%{name}-%{version}.tar.xz
+# Source0-md5: 772d2ac09f96dda203d49f0b80bc58f3
Source1: %{name}.desktop
Source2: %{name}.png
Patch0: %{name}-proc.patch
-Patch1: gmp5.patch
URL: http://smalltalk.gnu.org/
BuildRequires: OpenGL-devel
BuildRequires: OpenGL-glut-devel
@@ -25,9 +24,11 @@ BuildRequires: SDL-devel
BuildRequires: atk-devel >= 1.0.0
BuildRequires: autoconf >= 2.52
BuildRequires: automake
+BuildRequires: expat-devel
BuildRequires: gawk
BuildRequires: gdbm-devel
BuildRequires: glib2-devel >= 2.0.0
+BuildRequires: gnutls-devel
BuildRequires: gtk+2-devel >= 1:2.0.0
BuildRequires: libffi-devel
BuildRequires: libltdl-devel
@@ -98,6 +99,18 @@ blox-tk module for GNU Smalltalk.
%description tk -l pl.UTF-8
Moduł blox-tk dla GNU Smalltalka.
+%package expat
+Summary: Expat module for GNU Smalltalk
+Summary(pl.UTF-8): Moduł Expat dla GNU Smalltalka
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description expat
+Expat module for GNU Smalltalk.
+
+%description expat -l pl.UTF-8
+Moduł Expat dla GNU Smalltalka.
+
%package gdbm
Summary: GDBM module for GNU Smalltalk
Summary(pl.UTF-8): Moduł GDBM dla GNU Smalltalka
@@ -161,7 +174,6 @@ Moduł OpenGL dla GNU Smalltalka.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%configure \
@@ -176,6 +188,7 @@ Moduł OpenGL dla GNU Smalltalka.
# gtk things are generated improperly when some locale are set
%{__make} \
+ LIBTHREAD="-lpthread" \
LC_ALL=C
%install
@@ -211,25 +224,27 @@ rm -rf $RPM_BUILD_ROOT
%doc AUTHORS NEWS README THANKS
%attr(755,root,root) %{_bindir}/gst
%attr(755,root,root) %{_bindir}/gst-blox
+%attr(755,root,root) %{_bindir}/gst-browser
%attr(755,root,root) %{_bindir}/gst-convert
%attr(755,root,root) %{_bindir}/gst-doc
%attr(755,root,root) %{_bindir}/gst-load
+%attr(755,root,root) %{_bindir}/gst-profile
%attr(755,root,root) %{_bindir}/gst-reload
%attr(755,root,root) %{_bindir}/gst-remote
%attr(755,root,root) %{_bindir}/gst-sunit
%attr(755,root,root) %{_libdir}/libgst.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgst.so.7
%dir %{_libdir}/smalltalk
%{_libdir}/smalltalk/libc.la
%attr(755,root,root) %{_libdir}/smalltalk/digest*.so
%{_libdir}/smalltalk/digest.la
%attr(755,root,root) %{_libdir}/smalltalk/i18n*.so
+%attr(755,root,root) %{_libdir}/smalltalk/gnutls-wrapper
%{_libdir}/smalltalk/i18n.la
%attr(755,root,root) %{_libdir}/smalltalk/iconv*.so
%{_libdir}/smalltalk/iconv.la
%attr(755,root,root) %{_libdir}/smalltalk/zlib*.so
%{_libdir}/smalltalk/zlib.la
-%attr(755,root,root) %{_libdir}/smalltalk/sockets*.so
-%{_libdir}/smalltalk/sockets.la
%dir %{_libdir}/smalltalk/vfs
%attr(755,root,root) %{_libdir}/smalltalk/vfs/*
%{_datadir}/smalltalk
@@ -238,6 +253,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/gst-convert.1*
%{_mandir}/man1/gst-doc.1*
%{_mandir}/man1/gst-load.1*
+%{_mandir}/man1/gst-profile.1*
%{_mandir}/man1/gst-reload.1*
%{_mandir}/man1/gst-sunit.1*
%{_desktopdir}/*.desktop
@@ -267,6 +283,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/smalltalk/blox-tk*.so
%{_libdir}/smalltalk/blox-tk.la
+%files expat
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/smalltalk/expat*.so
+%{_libdir}/smalltalk/expat.la
+
%files gdbm
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/smalltalk/gdbm*.so
diff --git a/gmp5.patch b/gmp5.patch
deleted file mode 100644
index d269017..0000000
--- a/gmp5.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 04ac00a8126a0b328e231e01ab4b257b28c5da3c Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <bonzini at gnu.org>
-Date: Fri, 8 Jan 2010 16:00:36 +0100
-Subject: [PATCH] hack to build with GMP 5
-
-libgst:
-2010-01-08 Paolo Bonzini <bonzini at gnu.org>
-
- * libgst/mpz.c: Hack to build with GMP 5.
----
- libgst/ChangeLog | 4 ++++
- libgst/mpz.c | 20 ++++++++++++++++++--
- 2 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/libgst/mpz.c b/libgst/mpz.c
-index eaee0e8..d8e8b6b 100644
---- a/libgst/mpz.c
-+++ b/libgst/mpz.c
-@@ -1513,13 +1513,21 @@ _gst_mpz_xor (gst_mpz *res, const gst_mpz *op1, const gst_mpz *op2)
- }
- }
-
-+#if __GNU_MP_VERSION >= 5
-+extern void __gmpn_divexact (mp_ptr, mp_srcptr, mp_size_t, mp_srcptr, mp_size_t);
-+#endif
-+
- void
- _gst_mpz_divexact (gst_mpz *quot, const gst_mpz *num, const gst_mpz *den)
- {
-- mp_ptr qp, tp;
-+ mp_ptr qp;
- mp_srcptr np, dp;
-- mp_size_t nsize, dsize, qsize, d_zero_limbs;
-+ mp_size_t nsize, dsize, qsize;
-+#if __GNU_MP_VERSION < 5
-+ mp_ptr tp;
-+ mp_size_t d_zero_limbs;
- int d_zero_bits;
-+#endif
-
- nsize = ABS (num->size);
- dsize = ABS (den->size);
-@@ -1542,6 +1550,7 @@ _gst_mpz_divexact (gst_mpz *quot, const gst_mpz *num, const gst_mpz *den)
- return;
- }
-
-+#if __GNU_MP_VERSION < 5
- /* Avoid quadratic behaviour, but do it conservatively. */
- if (nsize - dsize > 1500)
- {
-@@ -1560,6 +1569,7 @@ _gst_mpz_divexact (gst_mpz *quot, const gst_mpz *num, const gst_mpz *den)
- dsize -= d_zero_limbs;
- np += d_zero_limbs;
- nsize -= d_zero_limbs;
-+#endif
-
- /* Allocate where we place the result. It must be nsize limbs big
- because it also acts as a temporary area. */
-@@ -1567,6 +1577,7 @@ _gst_mpz_divexact (gst_mpz *quot, const gst_mpz *num, const gst_mpz *den)
- gst_mpz_realloc (quot, nsize);
- qp = quot->d;
-
-+#if __GNU_MP_VERSION < 5
- if (d_zero_bits != 0)
- {
- tp = (mp_ptr) alloca (dsize * SIZEOF_MP_LIMB_T);
-@@ -1579,9 +1590,14 @@ _gst_mpz_divexact (gst_mpz *quot, const gst_mpz *num, const gst_mpz *den)
- }
- else
- MPN_COPY(qp, np, nsize);
-+#endif
-
- qsize = nsize - dsize + 1;
-+#if __GNU_MP_VERSION < 5
- mpn_bdivmod (qp, qp, nsize, dp, dsize, qsize * GMP_NUMB_BITS);
-+#else
-+ __gmpn_divexact (qp, np, nsize, dp, dsize);
-+#endif
- quot->size = (num->size ^ den->size) >= 0 ? qsize : -qsize;
- }
-
---
-1.6.5
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/smalltalk.git/commitdiff/bb5ff558f6c19382cbd6692bd0418c85761440b5
More information about the pld-cvs-commit
mailing list