public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/coin-or-HiGHS] rawhide: Fix the zlib dependency
@ 2026-09-22 12:41 Jerry James
  0 siblings, 0 replies; only message in thread
From: Jerry James @ 2026-09-22 12:41 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/coin-or-HiGHS
Branch : rawhide
Commit : df342b68d9fc38a32cae5f004166abb73f217d72
Author : Jerry James <loganjerry@gmail.com>
Date   : 2026-09-22T06:41:04-06:00
Stats  : +20/-9 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/coin-or-HiGHS/c/df342b68d9fc38a32cae5f004166abb73f217d72?branch=rawhide

Log:
Fix the zlib dependency

---
diff --git a/coin-or-HiGHS-unbundle.patch b/coin-or-HiGHS-unbundle.patch
index 10420d8..2923838 100644
--- a/coin-or-HiGHS-unbundle.patch
+++ b/coin-or-HiGHS-unbundle.patch
@@ -20,8 +20,19 @@
  #include "HConfig.h"
  #include "HighsAppExternalDeps.h"
  #include "io/HighsIO.h"
---- HiGHS-1.15.1/CMakeLists.txt.orig	2026-07-13 09:54:10.447453642 -0600
-+++ HiGHS-1.15.1/CMakeLists.txt	2026-07-13 09:54:26.080125164 -0600
+--- HiGHS-1.15.1/cmake/cpp-highs.cmake.orig	2026-07-02 00:42:37.000000000 -0600
++++ HiGHS-1.15.1/cmake/cpp-highs.cmake	2026-09-21 11:41:30.542864415 -0600
+@@ -113,7 +113,7 @@ endif()
+ 
+ 
+ if(ZLIB AND ZLIB_FOUND)
+-  set(CONF_Z "find_dependency(ZLIB)")
++  set(CONF_Z "find_dependency(zlib-ng)")
+   set(CONF_ZLIB ${CONF_Z})
+ else()
+   set(CONF_ZLIB "")
+--- HiGHS-1.15.1/CMakeLists.txt.orig	2026-09-21 11:38:27.028216419 -0600
++++ HiGHS-1.15.1/CMakeLists.txt	2026-09-21 11:38:39.972761349 -0600
 @@ -558,8 +558,9 @@ if(NOT FAST_BUILD OR CSHARP)
  endif()
  
@@ -34,8 +45,8 @@
  endif()
  
  if (NOT CMAKE_INSTALL_DOCDIR STREQUAL "" AND BUILD_CXX)
---- HiGHS-1.15.1/cmake/sources.cmake.orig	2026-07-02 00:42:37.000000000 -0600
-+++ HiGHS-1.15.1/cmake/sources.cmake	2026-07-13 09:55:16.533539008 -0600
+--- HiGHS-1.15.1/cmake/sources.cmake.orig      2026-07-02 00:42:37.000000000 -0600
++++ HiGHS-1.15.1/cmake/sources.cmake   2026-07-13 09:55:16.533539008 -0600
 @@ -463,9 +393,6 @@ set(highs_sources
  
  # add catch header?
@@ -46,8 +57,8 @@
      interfaces/highs_c_api.h
      io/Filereader.h
      io/FilereaderLp.h
---- HiGHS-1.15.1/highs/CMakeLists.txt.orig	2026-07-13 09:54:07.872817310 -0600
-+++ HiGHS-1.15.1/highs/CMakeLists.txt	2026-07-13 10:33:45.276614239 -0600
+--- HiGHS-1.15.1/highs/CMakeLists.txt.orig	2026-09-21 11:38:23.756563508 -0600
++++ HiGHS-1.15.1/highs/CMakeLists.txt	2026-09-21 11:38:39.973313078 -0600
 @@ -57,8 +57,8 @@ if(NOT FAST_BUILD)
    )
  
@@ -59,7 +70,7 @@
    endif()
  
    # set the install rpath to the installed destination
-@@ -314,10 +315,7 @@ else()
+@@ -314,10 +314,7 @@ else()
  
  
    if(ZLIB AND ZLIB_FOUND)
@@ -819,8 +830,8 @@
    for (HighsInt en = 0; en < vector->packCount; en++) {
      HighsInt iRow = sorted_index[en];
      if (en % 5 == 0) printf("\n");
---- HiGHS-1.15.1/highs/util/HFactor.cpp.orig	2026-07-13 09:54:15.646690768 -0600
-+++ HiGHS-1.15.1/highs/util/HFactor.cpp	2026-07-13 09:54:26.088203673 -0600
+--- HiGHS-1.15.1/highs/util/HFactor.cpp.orig	2026-09-21 11:38:29.540001777 -0600
++++ HiGHS-1.15.1/highs/util/HFactor.cpp	2026-09-21 11:38:39.980341326 -0600
 @@ -13,7 +13,7 @@
  #include <cassert>
  #include <iostream>

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-22 12:41 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-22 12:41 [rpms/coin-or-HiGHS] rawhide: Fix the zlib dependency Jerry James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox