[packages/trousers] - updated to 0.3.14 - updated no_inline patch (inline issue resolved, but still keep hiding symbols

qboosh qboosh at pld-linux.org
Tue Apr 18 16:56:22 CEST 2017


commit e7c9c08130ab928a5bdb032f1ec3a526b8cfe3d0
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Apr 18 16:56:33 2017 +0200

    - updated to 0.3.14
    - updated no_inline patch (inline issue resolved, but still keep hiding symbols part)

 no_inline.patch | 46 ----------------------------------------------
 trousers.spec   | 14 +++++---------
 2 files changed, 5 insertions(+), 55 deletions(-)
---
diff --git a/trousers.spec b/trousers.spec
index 9befb3e..dde4c7d 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -6,16 +6,16 @@
 Summary:	TrouSerS - The open-source TCG Software Stack
 Summary(pl.UTF-8):	TrouSerS - programowy stos TCG o otwartych źródłach
 Name:		trousers
-Version:	0.3.13
-Release:	4
+Version:	0.3.14
+Release:	1
 License:	BSD
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
-# Source0-md5:	ad508f97b406f6e48cd90e85d78e7ca8
+# Source0-md5:	4a476b4f036dd20a764fb54fc24edbec
 Source1:	tcsd.service
 Patch0:		no_inline.patch
 URL:		http://trousers.sourceforge.net/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1.6
 %{?with_gtk:BuildRequires:	gtk+2-devel >= 1:2.0.0}
 BuildRequires:	libtool
@@ -86,13 +86,9 @@ Static TrouSerS library.
 Statyczna biblioteka TrouSerS.
 
 %prep
-%setup -q
-
+%setup -q -c
 %patch0 -p1
 
-# there is some unused variable causing warning
-sed -i -e 's/-Werror //' configure.in
-
 %build
 %{__libtoolize}
 %{__aclocal}
diff --git a/no_inline.patch b/no_inline.patch
index 4caeb51..2aedfa9 100644
--- a/no_inline.patch
+++ b/no_inline.patch
@@ -1,21 +1,3 @@
-diff -dur trousers-0.3.13.orig/src/include/tcsps.h trousers-0.3.13/src/include/tcsps.h
---- trousers-0.3.13.orig/src/include/tcsps.h	2014-04-24 20:05:44.000000000 +0200
-+++ trousers-0.3.13/src/include/tcsps.h	2016-09-27 14:38:43.000000000 +0200
-@@ -23,13 +23,6 @@
- int		   put_file(int);
- void		   close_file(int);
- void		   ps_destroy();
--#ifdef SOLARIS
--TSS_RESULT  read_data(int, void *, UINT32);
--TSS_RESULT  write_data(int, void *, UINT32);
--#else
--inline TSS_RESULT  read_data(int, void *, UINT32);
--inline TSS_RESULT  write_data(int, void *, UINT32);
--#endif
- int		   write_key_init(int, UINT32, UINT32, UINT32);
- TSS_RESULT	   cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16, UINT32, UINT32);
- TSS_RESULT	   UnloadBlob_KEY_PS(UINT16 *, BYTE *, TSS_KEY *);
-diff -dur trousers-0.3.13.orig/src/include/tspps.h trousers-0.3.13/src/include/tspps.h
 --- trousers-0.3.13.orig/src/include/tspps.h	2014-04-24 20:05:44.000000000 +0200
 +++ trousers-0.3.13/src/include/tspps.h	2016-09-27 14:38:43.000000000 +0200
 @@ -18,8 +18,8 @@
@@ -29,31 +11,3 @@ diff -dur trousers-0.3.13.orig/src/include/tspps.h trousers-0.3.13/src/include/t
  UINT32		   psfile_get_num_keys(int);
  TSS_RESULT	   psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *);
  TSS_RESULT	   psfile_remove_key_by_uuid(int, TSS_UUID *);
-diff -dur trousers-0.3.13.orig/src/tcs/ps/ps_utils.c trousers-0.3.13/src/tcs/ps/ps_utils.c
---- trousers-0.3.13.orig/src/tcs/ps/ps_utils.c	2014-04-24 20:05:44.000000000 +0200
-+++ trousers-0.3.13/src/tcs/ps/ps_utils.c	2016-09-27 14:39:40.000000000 +0200
-@@ -42,11 +42,7 @@
- struct key_disk_cache *key_disk_cache_head = NULL;
- 
- 
--#ifdef SOLARIS
- TSS_RESULT
--#else
--inline TSS_RESULT
--#endif
- read_data(int fd, void *data, UINT32 size)
- {
- 	int rc;
-@@ -64,11 +60,7 @@
- }
- 
- 
--#ifdef SOLARIS
- TSS_RESULT
--#else
--inline TSS_RESULT
--#endif
- write_data(int fd, void *data, UINT32 size)
- {
- 	int rc;
-Only in trousers-0.3.13/src/tcs/ps: ps_utils.c~
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/trousers.git/commitdiff/e7c9c08130ab928a5bdb032f1ec3a526b8cfe3d0



More information about the pld-cvs-commit mailing list