From 6beb7211c30f0b4feeb7e487dc25899507ae72b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 20 Sep 2021 21:13:29 +0200 Subject: ArchLinux: Update tdepim, tdemultimedia, tdenetwork, tdegraphics and tdegames to R14.0.10. Backport patches to tdegraphics to resolve FTBFS. Switch tdemultimedia to CMake. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- arch/tde-base/tde-tdegraphics/PKGBUILD | 47 +++++++++------- .../tde-base/tde-tdegraphics/bp000-d19460fd6e.diff | 33 ++++++++++++ .../tde-base/tde-tdegraphics/bp001-866f96c1f4.diff | 63 ++++++++++++++++++++++ 3 files changed, 124 insertions(+), 19 deletions(-) create mode 100644 arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff create mode 100644 arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff (limited to 'arch/tde-base/tde-tdegraphics') diff --git a/arch/tde-base/tde-tdegraphics/PKGBUILD b/arch/tde-base/tde-tdegraphics/PKGBUILD index c7c1d4ce8..f48b8cbf5 100644 --- a/arch/tde-base/tde-tdegraphics/PKGBUILD +++ b/arch/tde-base/tde-tdegraphics/PKGBUILD @@ -2,11 +2,11 @@ # Contributor: e1z0 pkgname=tde-tdegraphics -pkgver=14.0.5 +pkgver=14.0.10 pkgrel=1 pkgdesc="Trinity Desktop Graphics Components" arch=('i686' 'x86_64') -url='http://scm.trinitydesktop.org/scm/git/tdegraphics' +url='https://scm.trinitydesktop.org/scm/git/tdegraphics' license=('GPL') groups=('tde-base') depends=('tde-tdebase' 'libgphoto2' 'fribidi' 'sane') @@ -15,27 +15,36 @@ provides=('tdegraphics') conflicts=('trinity-tdegraphics' 'trinity-kdegraphics') replaces=('trinity-tdegraphics') options=('staticlibs' 'libtool' '!strip') -source=("http://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/tdegraphics-R${pkgver}.tar.bz2") -md5sums=('6edfbe368abb5530cacc9f610e385f55') +source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdegraphics-trinity-${pkgver}.tar.xz" + 'bp000-d19460fd6e.diff' + 'bp001-866f96c1f4.diff') +md5sums=('0b069eb140a9f8b8bbe4556f1bd313d9' + 'c5ccbf331b4b0b6a0af61687cc3308a5' + 'bd4a586fb17963697afceef79adc35a5') # install='' +[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity + build() { - cd $srcdir - - msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build - msg "Starting cmake..." - cmake ${srcdir}/${pkgname#*-} \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -DWITH_ARTS=ON \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DBUILD_ALL=ON - - msg "Building - ${pkgname#*-}..." - make $NUMJOBS + cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} + patch -p1 < ${srcdir}/bp000-d19460fd6e.diff + patch -p1 < ${srcdir}/bp001-866f96c1f4.diff + + cd $srcdir + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${PKG_CONFIG_PATH} + + msg "Starting cmake..." + cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ + -DBUILD_ALL=ON + msg "Building - ${pkgname#*-}..." + make $NUMJOBS } package() { diff --git a/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff b/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff new file mode 100644 index 000000000..1565ee3f2 --- /dev/null +++ b/arch/tde-base/tde-tdegraphics/bp000-d19460fd6e.diff @@ -0,0 +1,33 @@ +From d19460fd6eae693832e4c5160aa2071bf71062f6 Mon Sep 17 00:00:00 2001 +From: Mavridis Philippe +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 +--- + 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 + diff --git a/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff b/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff new file mode 100644 index 000000000..3508d7437 --- /dev/null +++ b/arch/tde-base/tde-tdegraphics/bp001-866f96c1f4.diff @@ -0,0 +1,63 @@ +From 866f96c1f45c0d8302267c3bc3b286369cf9dcfe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= +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 +--- + 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 + -- cgit v1.2.1