diff --git a/srcpkgs/texworks/patches/cross.patch b/srcpkgs/texworks/patches/cross.patch index af924d58da..3c34950c0f 100644 --- a/srcpkgs/texworks/patches/cross.patch +++ b/srcpkgs/texworks/patches/cross.patch @@ -1,53 +1,19 @@ ---- a/modules/QtPDF/CMake/Modules/FindPoppler.cmake 2017-04-29 18:23:51.000000000 +0200 -+++ b/modules/QtPDF/CMake/Modules/FindPoppler.cmake 2018-08-29 09:13:02.788284947 +0200 -@@ -69,15 +69,7 @@ - MESSAGE(STATUS "Could not find libpoppler." ) - ENDIF () +--- a/modules/QtPDF/CMake/Modules/FindPoppler.cmake ++++ b/modules/QtPDF/CMake/Modules/FindPoppler.cmake +@@ -79,15 +79,7 @@ + endif () + -# Scan poppler libraries for dependencies on Fontconfig --INCLUDE(GetPrerequisites) --MARK_AS_ADVANCED(gp_cmd) --GET_PREREQUISITES("${POPPLER_BASE_LIBRARIES}" POPPLER_PREREQS TRUE FALSE "" "") --IF ("${POPPLER_PREREQS}" MATCHES "fontconfig") -- SET(POPPLER_NEEDS_FONTCONFIG TRUE) --ELSE () -- SET(POPPLER_NEEDS_FONTCONFIG FALSE) --ENDIF () -+SET(POPPLER_NEEDS_FONTCONFIG TRUE) +-include(GetPrerequisites) +-mark_as_advanced(gp_cmd) +-get_prerequisites("${Poppler_LIBRARY}" Poppler_PREREQS TRUE FALSE "" "") +-if ("${Poppler_PREREQS}" MATCHES "fontconfig") +- set(Poppler_NEEDS_FONTCONFIG TRUE) +-else () +- set(Poppler_NEEDS_FONTCONFIG FALSE) +-endif () ++set(Poppler_NEEDS_FONTCONFIG TRUE) - - FIND_PATH(POPPLER_QT_INCLUDE_DIR NAMES poppler-qt${QT_VERSION_MAJOR}.h poppler-link.h ---- a/CMakeLists.txt 2017-04-29 18:23:51.000000000 +0200 -+++ b/CMakeLists.txt 2018-08-29 10:49:36.290088209 +0200 -@@ -91,7 +91,6 @@ - SET(TeXworks_VERSION ${TeXworks_VER_MAJOR}.${TeXworks_VER_MINOR}.${TeXworks_VER_PATCH}) - - # Make sure we have up-to-date git commit infos --IF ( NOT CMAKE_CROSSCOMPILING ) - IF ( WIN32 ) - EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.bat WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) - ADD_CUSTOM_TARGET(GitRev ALL COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.bat WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Update git commit info") -@@ -99,7 +98,6 @@ - EXECUTE_PROCESS(COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) - ADD_CUSTOM_TARGET(GitRev ALL COMMAND ${CMAKE_SOURCE_DIR}/getGitRevInfo.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Update git commit info") - ENDIF ( WIN32 ) --ENDIF ( NOT CMAKE_CROSSCOMPILING) - MESSAGE( STATUS "Git commit info updated" ) - - # Recover git commit info from `src/GitRev.h`. -@@ -361,7 +359,6 @@ - # Some header files contain components that must be dynamically generated. For - # example, `getDefaultBinPaths.sh` is a script that tries to figure out the - # appropriate path to TeX binaries on UNIX-like systems. --IF ( UNIX AND NOT CMAKE_CROSSCOMPILING ) - IF ( NOT EXISTS ${TeXworks_SOURCE_DIR}/src/DefaultBinaryPaths.h ) - MESSAGE(STATUS "Generating DefaultBinaryPaths.h") - -@@ -371,7 +368,6 @@ - WORKING_DIRECTORY ${TeXworks_SOURCE_DIR} - ) - ENDIF () --ENDIF () - - # Building - # ======== + # ----------------------- + # Find Poppler components diff --git a/srcpkgs/texworks/patches/qt515.patch b/srcpkgs/texworks/patches/qt515.patch deleted file mode 100644 index 9c77c157e4..0000000000 --- a/srcpkgs/texworks/patches/qt515.patch +++ /dev/null @@ -1,21 +0,0 @@ -From a5352a3a94e3685125650b65e6197de060326cc2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= -Date: Fri, 1 May 2020 08:05:46 +0200 -Subject: [PATCH] Fix compilation with Qt 5.15 - ---- - modules/QtPDF/src/PDFBackend.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/QtPDF/src/PDFBackend.cpp b/modules/QtPDF/src/PDFBackend.cpp -index 0305d87a..500d20aa 100644 ---- a/modules/QtPDF/src/PDFBackend.cpp -+++ b/modules/QtPDF/src/PDFBackend.cpp -@@ -14,6 +14,7 @@ - - #include - #include -+#include - #include - - namespace QtPDF { diff --git a/srcpkgs/texworks/template b/srcpkgs/texworks/template index 87ca840493..55f9b4ede7 100644 --- a/srcpkgs/texworks/template +++ b/srcpkgs/texworks/template @@ -1,22 +1,20 @@ # Template file for 'texworks' pkgname=texworks -version=0.6.3 -revision=4 +version=0.6.6 +revision=1 wrksrc="texworks-release-${version}" build_style=cmake configure_args="-DTW_BUILD_ID=Void -DWITH_LUA=ON -DWITH_PYTHON=ON -DDESIRED_QT_VERSION:STRING=5" hostmakedepends="pkg-config qt5-qmake qt5-host-tools" makedepends="lua53-devel python3-devel qt5-tools-devel qt5-script-devel - poppler-qt5-devel hunspell-devel" + qt5-declarative-devel poppler-qt5-devel hunspell-devel" depends="hunspell dejavu-fonts-ttf" short_desc="TeX editor" maintainer="Bosco " license="GPL-2.0-or-later" homepage="https://www.tug.org/texworks" distfiles="https://github.com/texworks/texworks/archive/release-${version}.tar.gz" -checksum=b4695539b9666935d2c467cc618c7d79c174e2ec728e31f72df8534862a5c290 - -do_check() { - : # requires xserver -} +checksum=c0742fd76de0cacdd52bbf406788a4fe30ee281df2cf085531d98ee4b7f9b72f +# Tests require xserver +make_check=no