Accepting request 872148 from Publishing
OBS-URL: https://build.opensuse.org/request/show/872148 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texworks?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
65a591b1c8
176
texworks-drop-FindLua-cmake-module.patch
Normal file
176
texworks-drop-FindLua-cmake-module.patch
Normal file
@ -0,0 +1,176 @@
|
||||
Index: texworks-release-0.6.5/CMake/Modules/FindLua.cmake
|
||||
===================================================================
|
||||
--- texworks-release-0.6.5.orig/CMake/Modules/FindLua.cmake
|
||||
+++ /dev/null
|
||||
@@ -1,171 +0,0 @@
|
||||
-#.rst:
|
||||
-# FindLua
|
||||
-# -------
|
||||
-#
|
||||
-#
|
||||
-#
|
||||
-# Locate Lua library This module defines
|
||||
-#
|
||||
-# ::
|
||||
-#
|
||||
-# LUA_FOUND - if false, do not try to link to Lua
|
||||
-# LUA_LIBRARIES - both lua and lualib
|
||||
-# LUA_INCLUDE_DIR - where to find lua.h
|
||||
-# LUA_VERSION_STRING - the version of Lua found
|
||||
-# LUA_VERSION_MAJOR - the major version of Lua
|
||||
-# LUA_VERSION_MINOR - the minor version of Lua
|
||||
-# LUA_VERSION_PATCH - the patch version of Lua
|
||||
-#
|
||||
-#
|
||||
-#
|
||||
-# Note that the expected include convention is
|
||||
-#
|
||||
-# ::
|
||||
-#
|
||||
-# #include "lua.h"
|
||||
-#
|
||||
-# and not
|
||||
-#
|
||||
-# ::
|
||||
-#
|
||||
-# #include <lua/lua.h>
|
||||
-#
|
||||
-# This is because, the lua location is not standardized and may exist in
|
||||
-# locations other than lua/
|
||||
-
|
||||
-#=============================================================================
|
||||
-# Copyright 2007-2009 Kitware, Inc.
|
||||
-# Copyright 2013 Rolf Eike Beer <eike@sf-mail.de>
|
||||
-#
|
||||
-# Distributed under the OSI-approved BSD License (the "License");
|
||||
-# see accompanying file Copyright.txt for details.
|
||||
-#
|
||||
-# This software is distributed WITHOUT ANY WARRANTY; without even the
|
||||
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
-# See the License for more information.
|
||||
-#=============================================================================
|
||||
-# (To distribute this file outside of CMake, substitute the full
|
||||
-# License text for the above reference.)
|
||||
-
|
||||
-unset(_lua_include_subdirs)
|
||||
-unset(_lua_library_names)
|
||||
-
|
||||
-# this is a function only to have all the variables inside go away automatically
|
||||
-function(set_lua_version_vars)
|
||||
- set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
|
||||
-
|
||||
- if (Lua_FIND_VERSION_EXACT)
|
||||
- if (Lua_FIND_VERSION_COUNT GREATER 1)
|
||||
- set(lua_append_versions ${Lua_FIND_VERSION_MAJOR}.${Lua_FIND_VERSION_MINOR})
|
||||
- endif ()
|
||||
- elseif (Lua_FIND_VERSION)
|
||||
- # once there is a different major version supported this should become a loop
|
||||
- if (NOT Lua_FIND_VERSION_MAJOR GREATER 5)
|
||||
- if (Lua_FIND_VERSION_COUNT EQUAL 1)
|
||||
- set(lua_append_versions ${LUA_VERSIONS5})
|
||||
- else ()
|
||||
- foreach (subver IN LISTS LUA_VERSIONS5)
|
||||
- if (NOT subver VERSION_LESS ${Lua_FIND_VERSION})
|
||||
- list(APPEND lua_append_versions ${subver})
|
||||
- endif ()
|
||||
- endforeach ()
|
||||
- endif ()
|
||||
- endif ()
|
||||
- else ()
|
||||
- # once there is a different major version supported this should become a loop
|
||||
- set(lua_append_versions ${LUA_VERSIONS5})
|
||||
- endif ()
|
||||
-
|
||||
- foreach (ver IN LISTS lua_append_versions)
|
||||
- string(REGEX MATCH "^([0-9]+)\\.([0-9]+)$" _ver "${ver}")
|
||||
- list(APPEND _lua_include_subdirs
|
||||
- include/lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
|
||||
- include/lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
|
||||
- include/lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
|
||||
- )
|
||||
- list(APPEND _lua_library_names
|
||||
- lua${CMAKE_MATCH_1}${CMAKE_MATCH_2}
|
||||
- lua${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
|
||||
- lua-${CMAKE_MATCH_1}.${CMAKE_MATCH_2}
|
||||
- )
|
||||
- endforeach ()
|
||||
-
|
||||
- set(_lua_include_subdirs "${_lua_include_subdirs}" PARENT_SCOPE)
|
||||
- set(_lua_library_names "${_lua_library_names}" PARENT_SCOPE)
|
||||
-endfunction(set_lua_version_vars)
|
||||
-
|
||||
-set_lua_version_vars()
|
||||
-
|
||||
-find_path(LUA_INCLUDE_DIR lua.h
|
||||
- HINTS
|
||||
- ENV LUA_DIR
|
||||
- PATH_SUFFIXES ${_lua_include_subdirs} include/lua include
|
||||
- PATHS
|
||||
- ~/Library/Frameworks
|
||||
- /Library/Frameworks
|
||||
- /sw # Fink
|
||||
- /opt/local # DarwinPorts
|
||||
- /opt/csw # Blastwave
|
||||
- /opt
|
||||
-)
|
||||
-unset(_lua_include_subdirs)
|
||||
-
|
||||
-find_library(LUA_LIBRARY
|
||||
- NAMES ${_lua_library_names} lua
|
||||
- HINTS
|
||||
- ENV LUA_DIR
|
||||
- PATH_SUFFIXES lib
|
||||
- PATHS
|
||||
- ~/Library/Frameworks
|
||||
- /Library/Frameworks
|
||||
- /sw
|
||||
- /opt/local
|
||||
- /opt/csw
|
||||
- /opt
|
||||
-)
|
||||
-unset(_lua_library_names)
|
||||
-
|
||||
-if (LUA_LIBRARY)
|
||||
- # include the math library for Unix
|
||||
- if (UNIX AND NOT APPLE AND NOT BEOS)
|
||||
- find_library(LUA_MATH_LIBRARY m)
|
||||
- set(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}")
|
||||
- # For Windows and Mac, don't need to explicitly include the math library
|
||||
- else ()
|
||||
- set(LUA_LIBRARIES "${LUA_LIBRARY}")
|
||||
- endif ()
|
||||
-endif ()
|
||||
-
|
||||
-if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
|
||||
- # At least 5.[012] have different ways to express the version
|
||||
- # so all of them need to be tested. Lua 5.2 defines LUA_VERSION
|
||||
- # and LUA_RELEASE as joined by the C preprocessor, so avoid those.
|
||||
- file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_strings
|
||||
- REGEX "^#define[ \t]+LUA_(RELEASE[ \t]+\"Lua [0-9]|VERSION([ \t]+\"Lua [0-9]|_[MR])).*")
|
||||
-
|
||||
- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MAJOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MAJOR ";${lua_version_strings};")
|
||||
- if (LUA_VERSION_MAJOR MATCHES "^[0-9]+$")
|
||||
- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_MINOR[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_MINOR ";${lua_version_strings};")
|
||||
- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION_RELEASE[ \t]+\"([0-9])\"[ \t]*;.*" "\\1" LUA_VERSION_PATCH ";${lua_version_strings};")
|
||||
- set(LUA_VERSION_STRING "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}.${LUA_VERSION_PATCH}")
|
||||
- else ()
|
||||
- string(REGEX REPLACE ".*;#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
|
||||
- if (NOT LUA_VERSION_STRING MATCHES "^[0-9.]+$")
|
||||
- string(REGEX REPLACE ".*;#define[ \t]+LUA_VERSION[ \t]+\"Lua ([0-9.]+)\"[ \t]*;.*" "\\1" LUA_VERSION_STRING ";${lua_version_strings};")
|
||||
- endif ()
|
||||
- string(REGEX REPLACE "^([0-9]+)\\.[0-9.]*$" "\\1" LUA_VERSION_MAJOR "${LUA_VERSION_STRING}")
|
||||
- string(REGEX REPLACE "^[0-9]+\\.([0-9]+)[0-9.]*$" "\\1" LUA_VERSION_MINOR "${LUA_VERSION_STRING}")
|
||||
- string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]).*" "\\1" LUA_VERSION_PATCH "${LUA_VERSION_STRING}")
|
||||
- endif ()
|
||||
-
|
||||
- unset(lua_version_strings)
|
||||
-endif()
|
||||
-
|
||||
-#include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) #sl
|
||||
-# handle the QUIETLY and REQUIRED arguments and set LUA_FOUND to TRUE if
|
||||
-# all listed variables are TRUE
|
||||
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua
|
||||
- REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
|
||||
- VERSION_VAR LUA_VERSION_STRING)
|
||||
-
|
||||
-mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARY LUA_MATH_LIBRARY)
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 14 00:02:53 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
|
||||
|
||||
- Add texworks-drop-FindLua-cmake-module.patch: Drop custom
|
||||
FindLua.cmake included in sources in favour of cmake's default
|
||||
module [gh#TeXworks/texworks#924].
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 5 18:48:42 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package texworks
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2007-09 by Jonathan Kew.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -27,6 +27,8 @@ URL: https://www.tug.org/texworks/
|
||||
Source0: https://github.com/TeXworks/texworks/archive/release-%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: 0001-QtPDF-Fix-compilation-with-Qt-5.15.patch
|
||||
# PATCH-FIX-UPSTREAM texworks-drop-FindLua-cmake-module.patch gh#TeXworks/texworks#924 badshah400@gmail.com -- Drop custom FindLua.cmake included in sources in favour of cmake's default module
|
||||
Patch1: texworks-drop-FindLua-cmake-module.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: dbus-1-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
@ -83,11 +85,9 @@ environment) that is modeled on Dick Koch's TeXShop for Mac OS X.
|
||||
This package adds lua scripting abitilies to TeXworks.
|
||||
|
||||
%prep
|
||||
%setup -q -n texworks-release-%{version}
|
||||
%patch0 -p1
|
||||
%autosetup -p1 -n texworks-release-%{version}
|
||||
|
||||
%build
|
||||
|
||||
%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||
-DTW_BUILD_ID="openSUSE" \
|
||||
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=%{_lib} \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user