Backport patches to tdegraphics to resolve FTBFS. Switch tdemultimedia to CMake. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>pull/107/head
parent
b53b39c5b1
commit
6beb7211c3
@ -0,0 +1,33 @@
|
|||||||
|
From d19460fd6eae693832e4c5160aa2071bf71062f6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mavridis Philippe <mavridisf@gmail.com>
|
||||||
|
Date: Thu, 8 Jul 2021 23:14:10 +0300
|
||||||
|
Subject: Corrected boolean usage to conform with C++17 standard.
|
||||||
|
|
||||||
|
This resolves a FTBFS on some systems.
|
||||||
|
|
||||||
|
Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
|
||||||
|
---
|
||||||
|
kfaxview/libkfaximage/faxinit.cpp | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/kfaxview/libkfaximage/faxinit.cpp b/kfaxview/libkfaximage/faxinit.cpp
|
||||||
|
index aa6166aa..fa4517d2 100644
|
||||||
|
--- a/kfaxview/libkfaximage/faxinit.cpp
|
||||||
|
+++ b/kfaxview/libkfaximage/faxinit.cpp
|
||||||
|
@@ -319,11 +319,11 @@ FillTable(struct tabent *T, int Size, const struct proto *P, int State)
|
||||||
|
void
|
||||||
|
fax_init_tables(void)
|
||||||
|
{
|
||||||
|
- static bool already_initialized = 0;
|
||||||
|
+ static bool already_initialized = false;
|
||||||
|
if (already_initialized)
|
||||||
|
return;
|
||||||
|
|
||||||
|
- ++already_initialized;
|
||||||
|
+ already_initialized = true;
|
||||||
|
|
||||||
|
FillTable(MainTable, 7, Pass, S_Pass);
|
||||||
|
FillTable(MainTable, 7, Horiz, S_Horiz);
|
||||||
|
--
|
||||||
|
cgit v1.2.1
|
||||||
|
|
||||||
@ -0,0 +1,63 @@
|
|||||||
|
From 866f96c1f45c0d8302267c3bc3b286369cf9dcfe Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
|
||||||
|
Date: Thu, 8 Jul 2021 19:46:45 +0200
|
||||||
|
Subject: Use FindOpenGL instead of pkg_search_module( GLU ). This resolves
|
||||||
|
FTBFS on FreeBSD 13.
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
|
||||||
|
---
|
||||||
|
kpovmodeler/CMakeLists.txt | 4 ++--
|
||||||
|
kpovmodeler/ConfigureChecks.cmake | 9 +++++----
|
||||||
|
2 files changed, 7 insertions(+), 6 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
|
||||||
|
index 6ec98ae4..b589117f 100644
|
||||||
|
--- a/kpovmodeler/CMakeLists.txt
|
||||||
|
+++ b/kpovmodeler/CMakeLists.txt
|
||||||
|
@@ -19,7 +19,7 @@ include_directories(
|
||||||
|
${CMAKE_BINARY_DIR}
|
||||||
|
${TDE_INCLUDE_DIR}
|
||||||
|
${TQT_INCLUDE_DIRS}
|
||||||
|
- ${GLU_INCLUDE_DIRS}
|
||||||
|
+ ${OPENGL_INCLUDE_DIRS}
|
||||||
|
${FREETYPE_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
@@ -112,7 +112,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC
|
||||||
|
pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp
|
||||||
|
pmpartiface.skel
|
||||||
|
VERSION 0.0.0
|
||||||
|
- LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
|
||||||
|
+ LINK tdeparts-shared ${OPENGL_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
|
||||||
|
DESTINATION ${LIB_INSTALL_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
diff --git a/kpovmodeler/ConfigureChecks.cmake b/kpovmodeler/ConfigureChecks.cmake
|
||||||
|
index f4fdd1c0..a55045d4 100644
|
||||||
|
--- a/kpovmodeler/ConfigureChecks.cmake
|
||||||
|
+++ b/kpovmodeler/ConfigureChecks.cmake
|
||||||
|
@@ -10,13 +10,14 @@
|
||||||
|
#################################################
|
||||||
|
|
||||||
|
# glu
|
||||||
|
-pkg_search_module( GLU glu )
|
||||||
|
-if( NOT GLU_FOUND )
|
||||||
|
+set( OpenGL_GL_PREFERENCE LEGACY )
|
||||||
|
+find_package( OpenGL )
|
||||||
|
+if( NOT OPENGL_FOUND )
|
||||||
|
check_include_file ( GL/glu.h HAVE_GLU )
|
||||||
|
if( NOT HAVE_GLU )
|
||||||
|
- tde_message_fatal( "glu is required, but was not found on your system" )
|
||||||
|
+ tde_message_fatal( "OpenGL (glu) is required, but was not found on your system" )
|
||||||
|
endif ( )
|
||||||
|
- set( GLU_LIBRARIES "-lGL -lGLU" )
|
||||||
|
+ set( OPENGL_LIBRARIES "-lGL -lGLU" )
|
||||||
|
endif( )
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
cgit v1.2.1
|
||||||
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
diff -Naur tdemultimedia-orig/kscd/kcompactdisc.cpp tdemultimedia/kscd/kcompactdisc.cpp
|
|
||||||
--- tdemultimedia-orig/kscd/kcompactdisc.cpp 2018-08-25 05:29:23.000000000 +0000
|
|
||||||
+++ tdemultimedia/kscd/kcompactdisc.cpp 2019-01-31 10:16:44.000000000 +0000
|
|
||||||
@@ -42,11 +42,6 @@
|
|
||||||
#include <fcntl.h>
|
|
||||||
#include <sys/ioctl.h>
|
|
||||||
|
|
||||||
-/* this is for glibc 2.x which the ust structure in ustat.h not stat.h */
|
|
||||||
-#ifdef __GLIBC__
|
|
||||||
-#include <sys/ustat.h>
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
#ifdef __FreeBSD__
|
|
||||||
#include <sys/param.h>
|
|
||||||
#include <sys/ucred.h>
|
|
||||||
Loading…
Reference in new issue