From 102decc2cb2933917ea02b00e8a09149736be847 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Jul 20 2019 17:51:30 +0000 Subject: Drop -stat patch, no longer needed after gap-pkg-io update. Drop -doc patch: it is not the right solution to the problem. --- diff --git a/gap-doc.patch b/gap-doc.patch deleted file mode 100644 index 7ccd740..0000000 --- a/gap-doc.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- doc/ref/matobj.xml.orig 2018-11-01 16:56:12.000000000 -0600 -+++ doc/ref/matobj.xml 2019-02-08 14:34:13.213378845 -0700 -@@ -48,6 +48,7 @@ vectors and matrices. - <#Include Label="MatObj_ZeroVector"> - <#Include Label="MatObj_ConstructingFilter_Vector"> - <#Include Label="MatObj_Randomize_Vectors"> -+ <#Include Label="CopySubVector"> - <#Include Label="MatObj_WeightOfVector"> - <#Include Label="MatObj_DistanceOfVectors"> - ---- doc/ref/types.xml.orig 2018-11-01 16:56:12.000000000 -0600 -+++ doc/ref/types.xml 2019-02-12 15:49:20.589138949 -0700 -@@ -345,6 +345,7 @@ objects. It provides automatic storing - below). - - <#Include Label="RepresentationsOfObject"> -+<#Include Label="IsPositionalObjectRep"> - - - ---- lib/matobj2.gd.orig 2018-11-01 16:56:12.000000000 -0600 -+++ lib/matobj2.gd 2019-02-08 14:34:16.934332151 -0700 -@@ -565,8 +565,8 @@ DeclareOperation( "Randomize", [IsVector - ## <#GAPDoc Label="CopySubVector"> - ## - ## --## - ## nothing -+## - ## Does dst{dcols} := src{scols} - ## without creating an intermediate object and thus - at least in - ## special cases - much more efficiently. For certain objects like ---- lib/type.g.orig 2018-11-01 16:56:12.000000000 -0600 -+++ lib/type.g 2019-02-12 15:50:29.468882817 -0700 -@@ -293,6 +293,7 @@ end ); - #R IsComponentObjectRep - #R IsDataObjectRep - ## -+## <#GAPDoc Label="IsPositionalObjectRep"> - ## - ## - ## -@@ -303,6 +304,7 @@ end ); - ## the four basic representations in &GAP; - ## - ## -+## <#/GAPDoc> - ## - DeclareRepresentation( "IsInternalRep", IS_OBJECT, [], IS_OBJECT ); - DeclareRepresentation( "IsPositionalObjectRep", IS_OBJECT, [], IS_OBJECT ); diff --git a/gap-stat.patch b/gap-stat.patch deleted file mode 100644 index 17efa89..0000000 --- a/gap-stat.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- src/integer.c.orig 2019-02-23 15:43:33.000000000 -0700 -+++ src/integer.c 2019-03-12 13:39:47.357775303 -0600 -@@ -567,6 +567,41 @@ Obj ObjInt_UInt8( UInt8 i ) - #endif - } - -+Obj ObjInt_LongLong( long long i ) -+{ -+ Obj gmp; -+ unsigned long long ull; -+ size_t j; -+ -+ if ( (-(1LL<= 0LL ) { -+ gmp = NewBag( T_INTPOS, sizeof(i) ); -+ ull = (unsigned long long) i; -+ } -+ else { -+ gmp = NewBag( T_INTNEG, sizeof(i) ); -+ ull = (unsigned long long) -i; -+ } -+ for ( j = 0U; j < sizeof(i) / sizeof(mp_limb_t); j++ ) -+ ((mp_limb_t *)ADDR_OBJ( gmp ))[j] = ull >> (j * sizeof(mp_limb_t)); -+ return GMP_NORMALIZE( gmp ); -+} -+ -+Obj ObjInt_ULongLong( unsigned long long i ) -+{ -+ Obj gmp; -+ size_t j; -+ -+ if ( i < 1ULL<> (j * sizeof(mp_limb_t)); -+ return GMP_NORMALIZE( gmp ); -+} -+ - /************************************************************************** - ** - ** Convert GAP Integers to various C types -- see header file ---- src/integer.h.orig 2019-02-23 15:43:33.000000000 -0700 -+++ src/integer.h 2019-03-12 13:39:47.358775285 -0600 -@@ -135,6 +135,8 @@ extern Obj ObjInt_Int(Int i); - extern Obj ObjInt_UInt(UInt i); - extern Obj ObjInt_Int8(Int8 i); - extern Obj ObjInt_UInt8(UInt8 i); -+extern Obj ObjInt_LongLong(long long i); -+extern Obj ObjInt_ULongLong(unsigned long long i); - - /************************************************************************** - ** diff --git a/gap.spec b/gap.spec index adf0068..7d83031 100644 --- a/gap.spec +++ b/gap.spec @@ -53,20 +53,14 @@ Patch0: %{name}-bootstrap.patch # This patch applies a change from Debian to allow help files to be in gzip # compressed DVI files, and also adds support for viewing with xdg-open. Patch1: %{name}-help.patch -# Add conversions from long long and unsigned long long values to GAP integers. -# This is needed in gap-pkg-io to convert stat information to internal form on -# 32-bit systems with the 64-bit stat interface. -Patch2: %{name}-stat.patch # Fix escapes in manualindex -Patch3: %{name}-escape.patch +Patch2: %{name}-escape.patch # Fix broken references in the reference manual's lab file -Patch4: %{name}-ref.patch -# Add symbols wanted by other packages to the reference manual -Patch5: %{name}-doc.patch +Patch3: %{name}-ref.patch # Fix paths in gac -Patch6: %{name}-gac.patch +Patch4: %{name}-gac.patch # Ctbl code tries to change an immutable object -Patch7: %{name}-immutable.patch +Patch5: %{name}-immutable.patch BuildRequires: desktop-file-utils BuildRequires: gcc-c++ @@ -203,8 +197,6 @@ Headers and library links for libgap. %patch3 %patch4 %patch5 -%patch6 -%patch7 # Get the README cp -p %{SOURCE1} README.fedora @@ -463,6 +455,10 @@ make check %{_libdir}/libgap.so %changelog +* Sat Jul 20 2019 Jerry James - 4.10.2-1 +- Drop -stat patch, no longer needed after gap-pkg-io update +- Drop -doc patch: it is not the right solution to the problem + * Tue Jun 25 2019 Jerry James - 4.10.2-1 - New upstream release - Make the main package own the GAP bin directory