]> git.pld-linux.org Git - packages/cmake.git/commitdiff
up to 3.27.6 master auto/th/cmake-3.27.6-1
authorJan Palus <atler@pld-linux.org>
Wed, 20 Sep 2023 21:02:50 +0000 (23:02 +0200)
committerJan Palus <atler@pld-linux.org>
Wed, 20 Sep 2023 21:02:50 +0000 (23:02 +0200)
cmake-findruby.patch
cmake-findruby2.patch
cmake-helpers.patch [deleted file]
cmake-jni.patch [new file with mode: 0644]
cmake-lib64.patch
cmake-libx32.patch
cmake.spec
disable-completness-check.patch [new file with mode: 0644]

index d4451bfa4d0226ed94718a6a3b01cb1285c1d506..dca7e9d9fc0959fcf69ebe91732efb05d2bf7f8a 100644 (file)
@@ -14,19 +14,19 @@ diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modul
 --- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby   2012-10-02 10:12:18.000000000 -0600
 +++ cmake-2.8.10-rc1/Modules/FindRuby.cmake    2012-10-02 15:50:30.463292214 -0600
 @@ -110,14 +110,8 @@
-   _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
-   _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
+   _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
+   _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
  
 -  # vendor_ruby available ?
--  execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
--    OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
+-  execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print 'true'"
+-    OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY  ERROR_QUIET)
 -
--  if(RUBY_HAS_VENDOR_RUBY)
--    _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
--    _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
+-  if(Ruby_HAS_VENDOR_RUBY)
+-    _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
+-    _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
 -  endif()
-+  _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-+  _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
++  _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
++  _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
  
    # save the results in the cache so we don't have to run ruby the next time again
-   set(RUBY_VERSION_MAJOR    ${RUBY_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
+   set(Ruby_VERSION_MAJOR    ${Ruby_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
index bdd9c3747da11fdfcf85c817317a3b93f0be8390..32fa6ef31055589bc0e21f4a861d8c5bb3c622c6 100644 (file)
@@ -1,10 +1,11 @@
---- cmake-2.8.12.2/Modules/FindRuby.cmake~     2014-08-26 22:03:46.000000000 +0200
-+++ cmake-2.8.12.2/Modules/FindRuby.cmake      2014-08-26 22:05:53.115892137 +0200
-@@ -170,6 +170,7 @@
-   find_path(RUBY_CONFIG_INCLUDE_DIR
+diff -urNp -x '*.orig' cmake-3.17.2.org/Modules/FindRuby.cmake cmake-3.17.2/Modules/FindRuby.cmake
+--- cmake-3.17.2.org/Modules/FindRuby.cmake    2021-04-12 22:19:23.761018307 +0200
++++ cmake-3.17.2/Modules/FindRuby.cmake        2021-04-12 22:19:24.521040438 +0200
+@@ -207,6 +207,7 @@ if( "${Ruby_FIND_VERSION_SHORT_NODOT}" G
+   find_path(Ruby_CONFIG_INCLUDE_DIR
      NAMES ruby/config.h  config.h
      HINTS
-+      ${RUBY_HDR_DIR}
-       ${RUBY_HDR_DIR}/${RUBY_ARCH}
-       ${RUBY_ARCH_DIR}
-   )
++      ${Ruby_HDR_DIR}
+       ${Ruby_HDR_DIR}/${Ruby_ARCH}
+       ${Ruby_ARCH_DIR}
+       ${Ruby_ARCHHDR_DIR}
diff --git a/cmake-helpers.patch b/cmake-helpers.patch
deleted file mode 100644 (file)
index 6284b80..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
---- cmake-3.0.2/Auxiliary/bash-completion/CMakeLists.txt.orig  2013-10-07 17:31:00.000000000 +0200
-+++ cmake-3.0.2/Auxiliary/bash-completion/CMakeLists.txt       2013-10-20 17:12:23.756481217 +0200
-@@ -5,4 +5,4 @@
- # add symlinks to the files in appropriate places
- #  /etc/bash_completion.d/
- #  DATADIR/completions (may be /usr/share/<package>/completions
--install(FILES cmake cpack ctest DESTINATION ${CMAKE_DATA_DIR}/completions)
-+install(FILES cmake cpack ctest DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions)
---- cmake-3.0.2/Auxiliary/CMakeLists.txt.orig  2013-10-20 17:07:32.733160096 +0200
-+++ cmake-3.0.2/Auxiliary/CMakeLists.txt       2013-10-20 17:13:38.969811394 +0200
-@@ -1,3 +1,3 @@
- install(FILES cmake-help.vim cmake-indent.vim cmake-syntax.vim DESTINATION ${CMAKE_DATA_DIR}/editors/vim)
--install(FILES cmake-mode.el DESTINATION ${CMAKE_DATA_DIR}/editors/emacs)
-+install(FILES cmake-mode.el DESTINATION ${CMAKE_INSTALL_DATADIR}/emacs/site-lisp)
- add_subdirectory (bash-completion)
diff --git a/cmake-jni.patch b/cmake-jni.patch
new file mode 100644 (file)
index 0000000..f11c273
--- /dev/null
@@ -0,0 +1,104 @@
+--- cmake-3.27.3/Modules/FindJNI.cmake.orig    2023-08-16 19:46:35.000000000 +0200
++++ cmake-3.27.3/Modules/FindJNI.cmake 2023-08-23 18:20:08.029434273 +0200
+@@ -141,7 +141,7 @@ macro(java_append_library_directories _v
+     # 1.6.0_18 + icedtea patches. However, it would be much better to base the
+     # guess on the first part of the GNU config.guess platform triplet.
+     if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+-      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
++      if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32" OR LIB_SUFFIX STREQUAL "x32")
+         set(_java_libarch "x32" "amd64" "i386")
+       else()
+         set(_java_libarch "amd64" "i386")
+@@ -272,56 +272,27 @@ if (WIN32)
+ endif()
+ set(_JNI_JAVA_DIRECTORIES_BASE
+-  /usr/lib/jvm/java
+-  /usr/lib/java
+-  /usr/lib/jvm
+-  /usr/local/lib/java
++  /usr/lib${LIB_SUFFIX}/jvm/java
++  /usr/lib${LIB_SUFFIX}/java
++  /usr/lib${LIB_SUFFIX}/jvm
++  /usr/local/lib${LIB_SUFFIX}/java
+   /usr/local/share/java
+-  /usr/lib/j2sdk1.4-sun
+-  /usr/lib/j2sdk1.5-sun
+   /opt/sun-jdk-1.5.0.04
+-  /usr/lib/jvm/java-6-sun
+-  /usr/lib/jvm/java-1.5.0-sun
+-  /usr/lib/jvm/java-6-sun-1.6.0.00       # can this one be removed according to #8821 ? Alex
+-  /usr/lib/jvm/java-6-openjdk
+-  /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0        # fedora
++  /usr/lib${LIB_SUFFIX}/jvm/java-6-sun
++  /usr/lib${LIB_SUFFIX}/jvm/java-1.5.0-sun
++  /usr/lib${LIB_SUFFIX}/jvm/java-6-sun-1.6.0.00       # can this one be removed according to #8821 ? Alex
++  /usr/lib${LIB_SUFFIX}/jvm/java-6-openjdk
++  /usr/lib${LIB_SUFFIX}/jvm/java-1.6.0-openjdk-1.6.0.0        # fedora
+   # Debian specific paths for default JVM
+-  /usr/lib/jvm/default-java
++  /usr/lib${LIB_SUFFIX}/jvm/default-java
+   # Arch Linux specific paths for default JVM
+-  /usr/lib/jvm/default
+-  # Ubuntu specific paths for default JVM
+-  /usr/lib/jvm/java-21-openjdk-{libarch}    # Ubuntu 23.04
+-  /usr/lib/jvm/java-20-openjdk-{libarch}    # Ubuntu 22.10
+-  /usr/lib/jvm/java-19-openjdk-{libarch}    # Ubuntu 22.04 LTS
+-  /usr/lib/jvm/java-18-openjdk-{libarch}    # Ubuntu 22.04 LTS
+-  /usr/lib/jvm/java-17-openjdk-{libarch}    # Ubuntu 18.04 LTS
+-  /usr/lib/jvm/java-16-openjdk-{libarch}    # Ubuntu 20.04 LTS
+-  /usr/lib/jvm/java-13-openjdk-{libarch}    # Ubuntu 20.04 LTS
+-  /usr/lib/jvm/java-11-openjdk-{libarch}    # Ubuntu 18.04 LTS
+-  /usr/lib/jvm/java-8-openjdk-{libarch}     # Ubuntu 15.10
+-  /usr/lib/jvm/java-7-openjdk-{libarch}     # Ubuntu 15.10
+-  /usr/lib/jvm/java-6-openjdk-{libarch}     # Ubuntu 15.10
+-  # OpenBSD specific paths for default JVM
+-  /usr/local/jdk-1.7.0
+-  /usr/local/jre-1.7.0
+-  /usr/local/jdk-1.6.0
+-  /usr/local/jre-1.6.0
+-  # FreeBSD specific paths for default JVM
+-  /usr/local/openjdk15
+-  /usr/local/openjdk14
+-  /usr/local/openjdk13
+-  /usr/local/openjdk12
+-  /usr/local/openjdk11
+-  /usr/local/openjdk8
+-  /usr/local/openjdk7
+-  # SuSE specific paths for default JVM
+-  /usr/lib64/jvm/java
+-  /usr/lib64/jvm/jre
++  /usr/lib${LIB_SUFFIX}/jvm/default
+   )
+ set(_JNI_JAVA_AWT_LIBRARY_TRIES)
+ set(_JNI_JAVA_INCLUDE_TRIES)
++if(NOT _JAVA_HOME_EXPLICIT)
+ foreach(_java_dir IN LISTS _JNI_JAVA_DIRECTORIES_BASE)
+   list(APPEND _JNI_JAVA_AWT_LIBRARY_TRIES
+     ${_java_dir}/jre/lib/{libarch}
+@@ -338,6 +309,7 @@ endforeach()
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+     ${_JNI_JAVA_AWT_LIBRARY_TRIES}
+   )
++endif()
+ set(JAVA_JVM_LIBRARY_DIRECTORIES)
+ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
+@@ -365,6 +337,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT
+   ${_JNI_JAVA_INCLUDE_TRIES}
+   )
++if(NOT _JAVA_HOME_EXPLICIT)
+ foreach(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
+   get_filename_component(jpath "${JAVA_PROG}" PATH)
+   foreach(JAVA_INC_PATH ../include ../java/include ../share/java/include)
+@@ -381,6 +354,7 @@ foreach(JAVA_PROG "${JAVA_RUNTIME}" "${J
+     endif()
+   endforeach()
+ endforeach()
++endif()
+ if(APPLE)
+   if(DEFINED XCODE_VERSION)
index 8eda9f7a4734e4a1f56498ae904060898143e408..95ec231a2770dbe84a92fd5f1cb075bc74c63f95 100644 (file)
@@ -11,9 +11,9 @@
  endmacro()
 --- cmake-3.1.0/Modules/FindZLIB.cmake~        2014-12-15 20:07:43.000000000 +0000
 +++ cmake-3.1.0/Modules/FindZLIB.cmake 2014-12-24 21:00:27.139263296 +0000
-@@ -85,8 +85,8 @@
- # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
- if(NOT ZLIB_LIBRARY)
+@@ -109,8 +109,8 @@ if(NOT ZLIB_LIBRARY)
+   endif()
    foreach(search ${_ZLIB_SEARCHES})
 -    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
 -    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
@@ -21,4 +21,5 @@
 +    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib64)
    endforeach()
  
-   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+   # Restore the original find library ordering
+
index 3624e9f8d4898ece696f67248184f1c394f53776..3bc7f186ac6cb44f3f3889c8bcc1db133d5a58e9 100644 (file)
@@ -1,8 +1,8 @@
 --- cmake-3.1.3/Modules/FindZLIB.cmake 2015-02-11 16:17:39.000000000 +0000
 +++ cmake-3.1.3.x32/Modules/FindZLIB.cmake     2015-03-05 21:07:55.935140350 +0000
 @@ -85,8 +85,8 @@
- # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library
- if(NOT ZLIB_LIBRARY)
+   endif()
    foreach(search ${_ZLIB_SEARCHES})
 -    find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
 -    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
@@ -10,7 +10,7 @@
 +    find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES libx32)
    endforeach()
  
-   include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+   # Restore the original find library ordering
 --- cmake-3.1.3/Modules/KDE3Macros.cmake       2015-02-11 16:17:39.000000000 +0000
 +++ cmake-3.1.3.x32/Modules/KDE3Macros.cmake   2015-03-05 21:07:55.935140350 +0000
 @@ -336,7 +336,7 @@
 -  file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/lib/kde3'\n")
 +  file(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/libx32/kde3'\n")
  
-    install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname})
+   install_files(${KDE3_LIBTOOL_DIR} FILES ${_laname})
  endmacro()
 --- cmake-3.9.6/Modules/FindGLEW.cmake.orig    2017-11-19 08:53:15.190680707 +0100
 +++ cmake-3.9.6/Modules/FindGLEW.cmake 2017-11-19 08:58:44.667490585 +0100
-@@ -139,12 +139,12 @@
+@@ -144,13 +144,13 @@
  find_library(GLEW_SHARED_LIBRARY_RELEASE
               NAMES GLEW glew glew32
+              NAMES_PER_DIR
 -             PATH_SUFFIXES lib lib64 libx32 lib/Release/${_arch}
 +             PATH_SUFFIXES libx32 lib64 lib lib/Release/${_arch}
               PATHS ENV GLEW_ROOT)
  
  find_library(GLEW_SHARED_LIBRARY_DEBUG
               NAMES GLEWd glewd glew32d
+              NAMES_PER_DIR
 -             PATH_SUFFIXES lib lib64
 +             PATH_SUFFIXES libx32 lib64 lib
               PATHS ENV GLEW_ROOT)
  
  
+@@ -159,13 +159,13 @@
+ find_library(GLEW_STATIC_LIBRARY_RELEASE
+              NAMES GLEW glew glew32s
+              NAMES_PER_DIR
+-             PATH_SUFFIXES lib lib64 libx32 lib/Release/${_arch}
++             PATH_SUFFIXES libx32 lib64 lib lib/Release/${_arch}
+              PATHS ENV GLEW_ROOT)
+ find_library(GLEW_STATIC_LIBRARY_DEBUG
+              NAMES GLEWds glewds glew32ds
+              NAMES_PER_DIR
+-             PATH_SUFFIXES lib lib64
++             PATH_SUFFIXES libx32 lib64 lib
+              PATHS ENV GLEW_ROOT)
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${__GLEW_CURRENT_FIND_LIBRARY_SUFFIXES})
 --- cmake-3.9.6/Modules/Platform/UnixPaths.cmake       2015-02-11 16:17:39.000000000 +0000
 +++ cmake-3.9.6.x32/Modules/Platform/UnixPaths.cmake   2015-03-05 21:14:33.208470807 +0000
 @@ -83,7 +83,7 @@
@@ -49,4 +66,4 @@
 +  /lib /lib32 /lib64 /libx32 /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
    )
  
- list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
+ if(CMAKE_SYSROOT_COMPILE)
index c3accf55f3afddfdf38ca372bcb266a34e411812..fd92643125d0098e291f029a5eb29c642d13fbc0 100644 (file)
@@ -1,31 +1,34 @@
 # TODO:
-# - system kwiml?
+# - system kwiml >= 1.0?
 # - make lib64/libx32 patch changes applicable everywhere
 # - any valid CMAKE_BUILD_TYPE causes overriding of our optflags
 #   (and default non-verbose makefiles are hiding it!)
 # - rpmldflags/rpmcppflags are not passed through %%cmake macro at all
 #   (is there any standard way???)
+# - FindJNI.cmake module is a PoS full of random incorrect paths,
+#   needs lib64/libx32 awareness
 #
 # Conditional build:
 %bcond_with    bootstrap       # use internal versions of some libraries
-%bcond_without gui             # don't build gui package
+%bcond_without gui             # gui package
 %bcond_with    tests           # perform "make test"
-%bcond_without doc             # don't build documentation
+%bcond_without doc             # documentation
 
 Summary:       Cross-platform, open-source make system
 Summary(pl.UTF-8):     Wieloplatformowy system make o otwartych źródłach
 Name:          cmake
-Version:       3.16.4
+Version:       3.27.6
 Release:       1
 License:       BSD
 Group:         Development/Building
-Source0:       https://cmake.org/files/v3.16/%{name}-%{version}.tar.gz
-# Source0-md5: e3dacb6b612a6b06f7054c7fb4e18616
+Source0:       https://cmake.org/files/v3.27/%{name}-%{version}.tar.gz
+# Source0-md5: 900aad400c67bf40238e5c0119128549
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-libx32.patch
-Patch2:                %{name}-helpers.patch
+Patch2:                %{name}-jni.patch
 Patch3:                %{name}-findruby.patch
 Patch4:                %{name}-findruby2.patch
+Patch5:                disable-completness-check.patch
 URL:           https://cmake.org/
 # system zlib,bzip2,xz,zstd used only when without system libarchive
 %if %{with gui}
@@ -33,21 +36,32 @@ BuildRequires:      Qt5Core-devel >= 5.0
 BuildRequires: Qt5Gui-devel >= 5.0
 BuildRequires: Qt5Widgets-devel >= 5.0
 %endif
+BuildRequires: automake
+BuildRequires: cppdap-devel
 BuildRequires: curl-devel
 BuildRequires: expat-devel
 BuildRequires: jsoncpp-devel >= 1.6.2-2
-BuildRequires: libarchive-devel
-BuildRequires: libstdc++-devel
-BuildRequires: libuv-devel
+BuildRequires: libarchive-devel >= 3.3.3
+%ifnarch %arch_with_atomics64
+BuildRequires: libatomic-devel
+%endif
+BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: libuv-devel >= 1.28.0
 BuildRequires: ncurses-devel > 5.9-3
 BuildRequires: ncurses-ext-devel > 5.9-3
+BuildRequires: nghttp2-devel
 %{?with_gui:BuildRequires:     qt5-build >= 5.0}
 %{?with_gui:BuildRequires:     qt5-qmake >= 5.0}
 BuildRequires: rhash-devel
-BuildRequires: rpmbuild(macros) >= 1.167
+BuildRequires: rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 2.025
 %{?with_doc:BuildRequires:     sphinx-pdg}
+BuildRequires: xz-devel
 BuildRequires: zlib-devel
+BuildRequires: zstd-devel
 Requires:      filesystem >= 3.0-52
+Requires:      libarchive >= 3.3.3
+Requires:      libuv >= 1.28.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -83,7 +97,10 @@ Dokumentacja do pakietu CMake w formacie HTML.
 Summary:       Qt GUI for CMake
 Summary(pl.UTF-8):     Graficzny interfejs użytkownika Qt dla CMake
 Group:         Development/Tools
+Requires(post,postun): desktop-file-utils
+Requires(post,postun): gtk-update-icon-cache
 Requires:      %{name} = %{version}-%{release}
+Requires:      hicolor-icon-theme
 
 %description gui
 This package contains the Qt based GUI for CMake.
@@ -108,10 +125,8 @@ Summary:   bash-completion for cmake
 Summary(pl.UTF-8):     Bashowe dopełnianie parametrów dla cmake'a
 Group:         Applications/Shells
 Requires:      %{name} = %{version}-%{release}
-Requires:      bash-completion >= 2.0
-%if "%{_rpmversion}" >= "5"
+Requires:      bash-completion >= 1:2.0
 BuildArch:     noarch
-%endif
 
 %description -n bash-completion-%{name}
 bash-completion for cmake.
@@ -130,11 +145,23 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+
+%{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' \
+       Modules/Compiler/XL-Fortran/cpp
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
 SET (CMAKE_INSTALL_SYSCONFDIR "%{_sysconfdir}" CACHE PATH " " FORCE)
 SET (CMAKE_INSTALL_DATADIR "%{_datadir}" CACHE PATH " " FORCE)
+SET (CMAKE_SYSTEM_NAME "Linux" CACHE STRING " " FORCE)
+SET (CMAKE_SYSTEM_VERSION "%(uname -r)" CACHE STRING " " FORCE)
+SET (CMAKE_CROSSCOMPILING FALSE CACHE BOOL " " FORCE)
+%ifarch x32
+SET (CMAKE_SYSTEM_PROCESSOR "x86_64" CACHE STRING " " FORCE)
+%else
+SET (CMAKE_SYSTEM_PROCESSOR "%{_target_cpu}" CACHE STRING " " FORCE)
+%endif
 EOF
 
 # cleanup backups after patching, modules are copied as-is
@@ -156,6 +183,7 @@ export LDFLAGS="%{rpmldflags}"
        --qt-qmake=%{_bindir}/qmake-qt5 \
        %{?with_doc:--sphinx-html} \
        %{?with_doc:--sphinx-man} \
+       %{?__jobs:--parallel=%{__jobs}} \
        --verbose
 
 %{__make} \
@@ -165,14 +193,26 @@ export LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# just a bit more recent than packaged in vim.spec
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/vim
+# packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_prefix}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post gui
+%update_desktop_database_post
+%update_icon_cache hicolor
+
+%postun gui
+%update_desktop_database_postun
+%update_icon_cache hicolor
+
 %files
 %defattr(644,root,root,755)
 %doc Copyright.txt README.rst *.gif
@@ -189,6 +229,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/cmake-buildsystem.7*
 %{_mandir}/man7/cmake-commands.7*
 %{_mandir}/man7/cmake-compile-features.7*
+%{_mandir}/man7/cmake-configure-log.7*
 %{_mandir}/man7/cmake-developer.7*
 %{_mandir}/man7/cmake-env-variables.7*
 %{_mandir}/man7/cmake-file-api.7*
@@ -198,6 +239,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/cmake-modules.7*
 %{_mandir}/man7/cmake-packages.7*
 %{_mandir}/man7/cmake-policies.7*
+%{_mandir}/man7/cmake-presets.7*
 %{_mandir}/man7/cmake-properties.7*
 %{_mandir}/man7/cmake-qt.7*
 %{_mandir}/man7/cmake-server.7*
@@ -209,7 +251,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/cmake/Modules/.NoDartCoverage
 %{_datadir}/cmake/Modules/*
 %{_datadir}/cmake/Templates
-%{_datadir}/cmake/editors
 %{_datadir}/cmake/include
 %{_aclocaldir}/cmake.m4
 
diff --git a/disable-completness-check.patch b/disable-completness-check.patch
new file mode 100644 (file)
index 0000000..05e3c8a
--- /dev/null
@@ -0,0 +1,11 @@
+--- cmake-3.27.3/Source/cmExportInstallFileGenerator.cxx.orig  2022-08-17 18:54:57.000000000 +0200
++++ cmake-3.27.3/Source/cmExportInstallFileGenerator.cxx       2022-09-27 11:07:37.195039337 +0200
+@@ -181,7 +181,7 @@ bool cmExportInstallFileGenerator::Gener
+   }
+   this->CleanupTemporaryVariables(os);
+-  this->GenerateImportedFileCheckLoop(os);
++  // disabled for distro packages: this->GenerateImportedFileCheckLoop(os);
+   // Generate an import file for each configuration.
+   // Don't do this if we only export INTERFACE_LIBRARY targets.
This page took 0.14683 seconds and 4 git commands to generate.