[gentoo-commits] repo/gentoo:master commit in: sci-libs/lmfit/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Conrad Kostecki" <conikost@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/lmfit/files/
Date: Tue, 23 Nov 2021 20:37:16 +0000 (UTC)	[thread overview]
Message-ID: <1637699579.ac26cb79f4b69b93b6b926f27465c38b511efe6d.conikost@gentoo> (raw)

commit:     ac26cb79f4b69b93b6b926f27465c38b511efe6d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Nov 16 16:54:48 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 20:32:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac26cb79

sci-libs/lmfit: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/22971
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch | 85 ----------------------------
 1 file changed, 85 deletions(-)

diff --git a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch b/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch
deleted file mode 100644
index 482ecebe8294..000000000000
--- a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 72dae8c23604288331c9a7f03f60ec792a384121 Mon Sep 17 00:00:00 2001
-From: christoph junghans <junghans@votca.org>
-Date: Mon, 22 Oct 2018 21:00:00 -0600
-Subject: [PATCH] cmake: minor distribution tweaks
-
-- use gnuinstalldirs to allow to configure install dirs
-- allow to disable injecting c flags
-
-signed-off-by: christoph junghans <junghans@votca.org>
-Signed-off-by: Alexey Shvetsov <alexxy@gentoo.org>
----
- CMakeLists.txt     | 10 +++++++---
- lib/CMakeLists.txt |  4 ++--
- man/CMakeLists.txt |  4 ++--
- 3 files changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dbb571e..279f06a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ cmake_policy(SET CMP0048 NEW)
- list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
- include(PreventInSourceBuilds)
- 
--project(lmfit VERSION 8.2.1 LANGUAGES C)
-+project(lmfit VERSION 8.2.2 LANGUAGES C)
- 
- # --- Declare project-wide user flags, and set default values ---
- option(FITTEST "Build with FitTest" OFF)
-@@ -23,12 +23,16 @@ else()
- endif()
- 
- include(CTest)
-+include(GNUInstallDirs)
- 
--set(destination ${CMAKE_INSTALL_PREFIX})
-+option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON)
-+if (INJECT_C_FLAGS)
-+    set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses  -Wno-unknown-pragmas")
-+endif()
- 
- configure_file("lmfit.pc.in" "lmfit.pc" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lmfit.pc"
--    DESTINATION "${destination}/lib/pkgconfig/")
-+    DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/")
- 
- add_subdirectory(lib)
- add_subdirectory(demo)
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index a266f4e..e071a3c 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -18,9 +18,9 @@ link_libm(${library_name})
- 
- install(
-     TARGETS ${library_name} LIBRARY
--    DESTINATION ${destination}/lib
-+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     COMPONENT Libraries)
- install(
-     FILES ${inc_files}
--    DESTINATION ${destination}/include
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-     COMPONENT Headers)
-diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
-index d4595fd..5505713 100644
---- a/man/CMakeLists.txt
-+++ b/man/CMakeLists.txt
-@@ -15,11 +15,11 @@ function(one_page pname section)
-         )
-     install(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man${section}"
-+        DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}"
-         )
-     install(
-         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.html
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/lmfit/html"
-+	     DESTINATION "${CMAKE_INSTALL_DOCDIR}/html"
-         )
- endfunction()
- 
--- 
-2.20.1
-

next             reply	other threads:[~2021-11-23 20:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-23 20:37 Conrad Kostecki [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-03-02 12:38 [gentoo-commits] repo/gentoo:master commit in: sci-libs/lmfit/files/ Andreas Sturmlechner

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:482ecebe829 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: sci-libs/lmfit/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1637699579.ac26cb79f4b69b93b6b926f27465c38b511efe6d.conikost@gentoo \
    --to=conikost@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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