Fix for issue #16

Removed R14.0.5 patches from tdebase.SlackBuild
pull/25/head
Ray-V 5 years ago
parent fee28837e7
commit 9780545654

@ -571,7 +571,7 @@ If this is a first run, answer 'yes' - be patient, downloads from git are slowww
For subsequent runs, 'yes' will update only.
Local repositories are created/updated as for the single downloads for 14.0.6 builds.
Local repositories are created/updated as each package is built.
If the current build list includes new apps, and you don't want the existing repos updated, the new apps should be run as a new group initially as selective updating is not supported.
Do you want to create or update the git repositories?

@ -107,60 +107,6 @@ do
patch -N -p0
done || true
## linux/stat.h:56:8: error: redefinition of struct statx_timestamp
## glibc-2.28 issue - commit de4afaaf00
echo $'--- kdesktop/lock/lockprocess.cc
+++ kdesktop/lock/lockprocess.cc
@@ -82,3 +81,0 @@
-#ifdef __linux__
-#include <linux/stat.h>
-#endif
' | while read line
do
patch -N -p0
done || true
## commit f6a5cd3e - rpc functions
echo $'
--- tdeioslave/ConfigureChecks.cmake
+++ tdeioslave/ConfigureChecks.cmake
@@ -26,0 +27,18 @@
+
+# rpc/rpc.h, originally was shipped with glibc ...
+check_include_file( rpc/rpc.h HAVE_RPC_H )
+# ... but later might be not present (deprecated from 2.26)
+if( NOT HAVE_RPC_H )
+ pkg_search_module( TIRPC libtirpc )
+ if( NOT TIRPC_FOUND )
+ tde_message_fatal( "rpc/rpc.h is required, please check your glibc or libtirpc package" )
+ endif( )
+endif( )
+
+message( STATUS "Looking for rpcgen" )
+find_program( RPCGEN_BINARY rpcgen )
+if( RPCGEN_BINARY )
+ message( STATUS "Looking for rpcgen - ${RPCGEN_BINARY}" )
+else( RPCGEN_BINARY )
+ tde_message_fatal( "rpcgen is required, but not found on your system" )
+endif( RPCGEN_BINARY )
--- tdeioslave/nfs/CMakeLists.txt
+++ tdeioslave/nfs/CMakeLists.txt
@@ -17,0 +18 @@
+ ${TIRPC_INCLUDE_DIRS}
@@ -35 +36 @@
- COMMAND rpcgen -c -o mount_xdr.c ${CMAKE_CURRENT_SOURCE_DIR}/mount.x
+ COMMAND ${RPCGEN_BINARY} -c -o mount_xdr.c ${CMAKE_CURRENT_SOURCE_DIR}/mount.x
@@ -39 +40 @@
- COMMAND rpcgen -c -o nfs_prot_xdr.c ${CMAKE_CURRENT_SOURCE_DIR}/nfs_prot.x
+ COMMAND ${RPCGEN_BINARY} -c -o nfs_prot_xdr.c ${CMAKE_CURRENT_SOURCE_DIR}/nfs_prot.x
@@ -44 +45 @@
- LINK tdeio-shared
+ LINK tdeio-shared ${TIRPC_LIBRARIES}
' | while read line
do
patch -N -p0
done || true
chown_fn
cd_builddir_fn

@ -41,11 +41,12 @@ chown_fn
# This configure script doesn't accept crap for arguments see ./configure --help to verify
[[ ! -d /usr/include/tqt ]] && sed -i "s|/usr/include/tqt|$INSTALL_TDE/include/tqt|g" configure || true
unset CT && [[ $TDEVERSION == cgit ]] && CT=t
LDFLAGS=$SLKLDFLAGS \
CXXFLAGS=$SLKCFLAGS \
CFLAGS=$SLKCFLAGS \
./configure \
--qtdir=$TQTDIR-$VERSION
--${CT:-}qtdir=$TQTDIR-$VERSION
## configure uses the installed tqt for it's flags - if this is a re-build of this package only,
## it may pick up the wrong march/mtune flags, or none at all - use SET_march as set up in BUILD-TDE.sh

Loading…
Cancel
Save