Accepting request 1146260 from home:badshah400:branches:Publishing

* Update to version 0.6.9. * Switch over to Qt6 builds. * Disable python bindings over compilation errors (gh#TeXworks/texworks#1038). * Add texworks-cmake-find-python.patch: cmake has dropped support for PythonInterp and PythonLibs, use FindPython instead (gh#TeXworks/texworks#1039). OBS-URL: https://build.opensuse.org/request/show/1146260 OBS-URL: https://build.opensuse.org/package/show/Publishing/texworks?expand=0&rev=26
2024-02-13 09:40:32 +00:00 · 2024-02-13 09:40:32 +00:00 · c3bf2766ce
commit c3bf2766ce
parent 728e484100
5 changed files with 150 additions and 18 deletions
--- a/texworks-0.6.8.tar.gz
+++ b/texworks-0.6.8.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9fa2aa69bb34951d3249ea607ce3689b6fff9e1f31e353bd1a1cfe33dc995837
-size 12486607
--- a/texworks-0.6.9.tar.gz
+++ b/texworks-0.6.9.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0c8e4b9f2fbb38f681b9d91f331366e5cdcb35dba7a94cb2988ccfca113ac2b
+size 12505487
--- a/texworks-cmake-find-python.patch
+++ b/texworks-cmake-find-python.patch
@ -0,0 +1,100 @@
+Index: texworks-release-0.6.9/CMakeLists.txt
+===================================================================
+--- texworks-release-0.6.9.orig/CMakeLists.txt
+++ texworks-release-0.6.9/CMakeLists.txt
+@@ -326,17 +326,14 @@ ENDIF()
+ 
+ IF ( WITH_PYTHON )
+   IF ( USE_SYSTEM_PYTHON )
+-    SET(PYTHON_LIBRARIES "-F/System/Library/Frameworks -framework Python" CACHE PATH "Python library.")
+-    SET(PYTHON_INCLUDE_DIR "/System/Library/Framework/Python.framework/Headers" CACHE PATH "Python framework.")
+-    MARK_AS_ADVANCED(PYTHON_LIBRARIES)
+-    MARK_AS_ADVANCED(PYTHON_INCLUDE_DIR)
+-    SET(PYTHONLIBS_FOUND TRUE)
+    SET(Python_LIBRARIES "-F/System/Library/Frameworks -framework Python" CACHE PATH "Python library.")
+    SET(Python_INCLUDE_DIR "/System/Library/Framework/Python.framework/Headers" CACHE PATH "Python framework.")
+    MARK_AS_ADVANCED(Python_LIBRARIES)
+    MARK_AS_ADVANCED(Python_INCLUDE_DIR)
+    SET(Python_Interpreter_FOUND TRUE)
+    SET(Python_Development_FOUND TRUE)
+   ELSE ()
+-    # **NOTE**
+-    # In order to find the correct version of 'PythonLibs', it seems that we need to run 'FIND_PACKAGE(PythonInterp)' firstly.
+-    # In order to find the correct version of 'PythonInterp', we need to set 'PYTHONHOME' environment variable
+-    FIND_PACKAGE(PythonInterp)
+-    FIND_PACKAGE(PythonLibs)
+    FIND_PACKAGE(Python COMPONENTS Interpreter Development)
+   ENDIF ()
+ ENDIF()
+ 
+@@ -344,7 +341,7 @@ IF ( LUA_FOUND AND WITH_LUA AND NOT ${BU
+   ADD_DEFINITIONS(-DQT_STATICPLUGIN -DSTATIC_LUA_SCRIPTING_PLUGIN)
+ ENDIF ()
+ 
+-IF ( PYTHONLIBS_FOUND AND WITH_PYTHON AND NOT ${BUILD_SHARED_PLUGINS})
+IF ( Python_Interpreter_FOUND AND Python_Development_FOUND AND WITH_PYTHON AND NOT ${BUILD_SHARED_PLUGINS})
+   ADD_DEFINITIONS(-DQT_STATICPLUGIN -DSTATIC_PYTHON_SCRIPTING_PLUGIN)
+ ENDIF ()
+ 
+@@ -406,7 +403,7 @@ IF ( LUA_FOUND AND WITH_LUA )
+   ADD_SUBDIRECTORY(${TeXworks_SOURCE_DIR}/plugins-src/TWLuaPlugin)
+ ENDIF ()
+ 
+-IF ( PYTHONLIBS_FOUND AND WITH_PYTHON )
+IF ( Python_Interpreter_FOUND AND Python_Development_FOUND AND WITH_PYTHON )
+   ADD_SUBDIRECTORY(${TeXworks_SOURCE_DIR}/plugins-src/TWPythonPlugin)
+ ENDIF ()
+ 
+@@ -509,7 +506,7 @@ IF ( WITH_LUA )
+   CONFIG_VERSION("Lua" "${LUA_VERSION_STRING}")
+ ENDIF()
+ if (WITH_PYTHON)
+-  CONFIG_VERSION("Python" "${PYTHON_VERSION_STRING}")
+  CONFIG_VERSION("Python" "${Python_VERSION}")
+ endif()
+ CONFIG_VERSION("Qt" ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})
+ CONFIG_VERSION("SyncTeX" "${SYNCTEX_VERSION_STRING}")
+@@ -520,7 +517,7 @@ message("  Scripting")
+ CONFIG_YESNO("  ECMA scripting" ON)
+ CONFIG_YESNO("  QtScript scripting" WITH_QTSCRIPT)
+ CONFIG_YESNO("  Lua scripting plugin" LUA_FOUND)
+-CONFIG_YESNO("  Python scripting plugin" PYTHONLIBS_FOUND)
+CONFIG_YESNO("  Python scripting plugin" Python_Development_FOUND)
+ message("")
+ 
+ CONFIG_INFO("Build ID" ${TW_BUILD_ID})
+Index: texworks-release-0.6.9/plugins-src/TWPythonPlugin/CMakeLists.txt
+===================================================================
+--- texworks-release-0.6.9.orig/plugins-src/TWPythonPlugin/CMakeLists.txt
+++ texworks-release-0.6.9/plugins-src/TWPythonPlugin/CMakeLists.txt
+@@ -37,13 +37,13 @@ if (NOT MSVC)
+ 	target_compile_options(TWPythonPlugin PRIVATE -Wno-old-style-cast)
+ endif ()
+ 
+-target_include_directories(TWPythonPlugin SYSTEM PRIVATE ${PYTHON_INCLUDE_DIRS})
+target_include_directories(TWPythonPlugin SYSTEM PRIVATE ${Python_INCLUDE_DIRS})
+ target_include_directories(TWPythonPlugin PRIVATE ${TeXworks_SOURCE_DIR}/src)
+ 
+ # Specify link libraries even if the plugin is built statically so all the
+ # interface properties of the Qt targets (include directories, lib directories,
+ # etc.) are available
+-TARGET_LINK_LIBRARIES(TWPythonPlugin ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${TEXWORKS_ADDITIONAL_LIBS})
+TARGET_LINK_LIBRARIES(TWPythonPlugin ${QT_LIBRARIES} ${Python_LIBRARIES} ${TEXWORKS_ADDITIONAL_LIBS})
+ IF (${BUILD_SHARED_PLUGINS})
+   INSTALL(TARGETS TWPythonPlugin
+     LIBRARY DESTINATION ${TeXworks_PLUGIN_DIR}
+Index: texworks-release-0.6.9/src/CMakeLists.txt
+===================================================================
+--- texworks-release-0.6.9.orig/src/CMakeLists.txt
+++ texworks-release-0.6.9/src/CMakeLists.txt
+@@ -207,8 +207,8 @@ IF (NOT ${BUILD_SHARED_PLUGINS})
+   IF (WITH_LUA AND LUA_FOUND)
+     LIST(INSERT TeXworks_LIBS 0 TWLuaPlugin ${LUA_LIBRARIES})
+   ENDIF()
+-  IF (WITH_PYTHON AND PYTHONLIBS_FOUND)
+-    LIST(INSERT TeXworks_LIBS 0 TWPythonPlugin ${PYTHON_LIBRARIES})
+  IF (WITH_PYTHON AND Python_Development_FOUND)
+    LIST(INSERT TeXworks_LIBS 0 TWPythonPlugin ${Python_LIBRARIES})
+   ENDIF()
+ ENDIF()
+ 
--- a/texworks.changes
+++ b/texworks.changes
@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Feb 12 10:35:26 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 0.6.9:
+  * Add support for PDF layers
+  * Add support for "--insert-text" and "--insert-cite" command
+    line options
+  * Enable customization of which columns are shown in the "Insert
+    Citations..." dialog
+  * Enable customization of the default citation command used by
+    the "Insert Citations..." dialog
+  * Add dtx tag patterns
+  * Improve command line parsing
+- Switch over to Qt6 builds.
+- Disable python bindings over compilation errors
+  (gh#TeXworks/texworks#1038).
+- Add texworks-cmake-find-python.patch: cmake has dropped support
+  for PythonInterp and PythonLibs, use FindPython instead
+  (gh#TeXworks/texworks#1039).
+
 -------------------------------------------------------------------
 Tue Mar 14 09:40:00 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>

--- a/texworks.spec
+++ b/texworks.spec
@ -1,7 +1,7 @@
 #
 # spec file for package texworks
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 # Copyright (c) 2007-09 by Jonathan Kew.
 #
 # All modifications and additions to the file contributed by third parties
@ -17,37 +17,45 @@
 #


+%define __builder ninja
+%bcond_with python
 Name:           texworks
-Version:        0.6.8
+Version:        0.6.9
 Release:        0
 Summary:        TeXshop-like TeX Editor
 License:        GPL-2.0-or-later
 Group:          Productivity/Publishing/TeX/Frontends
 URL:            https://www.tug.org/texworks/
 Source0:        https://github.com/TeXworks/texworks/archive/release-%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM texworks-cmake-find-python.patch gh#TeXworks/texworks#1039 badshah400@gmail.com -- cmake has dropped support for PythonInterp and PythonLibs, use FindPython instead
+Patch0:         texworks-cmake-find-python.patch
 BuildRequires:  cmake
 BuildRequires:  dbus-1-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  hunspell-devel
 BuildRequires:  libpoppler-devel >= 0.24
-BuildRequires:  libpoppler-qt5-devel >= 0.24
+BuildRequires:  libpoppler-qt6-devel >= 0.24
 BuildRequires:  lua-devel
+BuildRequires:  ninja
 BuildRequires:  pkgconfig
+%if %{with python}
+BuildRequires:  python-rpm-macros
 BuildRequires:  python3-devel
+%endif
 BuildRequires:  texlive-tex-bin
 BuildRequires:  update-desktop-files
-BuildRequires:  pkgconfig(Qt5Concurrent)
-BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5DBus)
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Qml)
-BuildRequires:  pkgconfig(Qt5Script)
-BuildRequires:  pkgconfig(Qt5ScriptTools)
-BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(Qt5UiTools)
-BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  pkgconfig(Qt5Xml)
+BuildRequires:  pkgconfig(Qt6Concurrent)
+BuildRequires:  pkgconfig(Qt6Core)
+BuildRequires:  pkgconfig(Qt6Core5Compat)
+BuildRequires:  pkgconfig(Qt6DBus)
+BuildRequires:  pkgconfig(Qt6Gui)
+BuildRequires:  pkgconfig(Qt6Linguist)
+BuildRequires:  pkgconfig(Qt6Qml)
+BuildRequires:  pkgconfig(Qt6Test)
+BuildRequires:  pkgconfig(Qt6UiTools)
+BuildRequires:  pkgconfig(Qt6Widgets)
+BuildRequires:  pkgconfig(Qt6Xml)
 Requires:       dbus-1
 Requires:       hunspell
 Requires:       poppler-tools
@ -88,8 +96,10 @@ This package adds lua scripting abitilies to TeXworks.
 %cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DTW_BUILD_ID="openSUSE" \
       -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=%{_lib} \
+       -DQT_DEFAULT_MAJOR_VERSION=6 \
       -DWITH_LUA=ON \
-       -DWITH_PYTHON=ON \
+       -DWITH_PYTHON=%{?with_python:ON}%{!?with_python:OFF} \
+       -DBUILD_SHARED_PLUGINS:BOOL=ON \
       -DTeXworks_DIC_DIR=%{_datadir}/myspell \
       -DTeXworks_PLUGIN_DIR=%{_libdir}/%{name}

@ -115,9 +125,11 @@ done
 %{_datadir}/icons/hicolor/*/apps/*.png
 %{_mandir}/man1/texworks.1%{?ext_man}

+%if %{with python}
 %files plugin-python
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*PythonPlugin.so
+%endif

 %files plugin-lua
 %dir %{_libdir}/%{name}