diff --git a/app-devel/stlink/autobuild/patches/0001-Fixed-install-paths-headers-stlink-gui.ui.patch b/app-devel/stlink/autobuild/patches/0001-Fixed-install-paths-headers-stlink-gui.ui.patch deleted file mode 100644 index 3df777a2594..00000000000 --- a/app-devel/stlink/autobuild/patches/0001-Fixed-install-paths-headers-stlink-gui.ui.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 9265cb265cf2073ad54e5843cee139a342306216 Mon Sep 17 00:00:00 2001 -From: Mingcong Bai -Date: Thu, 22 Apr 2021 19:16:37 -0500 -Subject: [PATCH] Fixed install paths (headers & stlink-gui.ui) - ---- - CMakeLists.txt | 4 ++-- - src/stlink-gui/CMakeLists.txt | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8628277..600243e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,7 +33,7 @@ endif () - - ## Set installation directories for header files ### TODO: Clean this up... - if (IS_DIRECTORY ${INCLUDE_INSTALL_DIR}) -- set(INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR} CACHE PATH "Main include directory") -+ set(STLINK_INCLUDE_PATH ${CMAKE_INSTALL_INCLUDEDIR}/stlink CACHE PATH "Main include install directory") - set(STLINK_INCLUDE_PATH "${INCLUDE_INSTALL_DIR}") - else () - set(INCLUDE_INSTALL_DIR "include" CACHE PATH "Main include directory") -@@ -143,7 +143,7 @@ endif () - set(STLINK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Main library install directory") - - # Set the environment variable LD_LIBRARY_PATH to point to /usr/local/lib (per default). --execute_process (COMMAND bash -c "export LD_LIBRARY_PATH="${CMAKE_INSTALL_LIBDIR}" ") -+execute_process(COMMAND bash -c "export LD_LIBRARY_PATH=${CMAKE_INSTALL_LIBDIR}") - - - ### -diff --git a/src/stlink-gui/CMakeLists.txt b/src/stlink-gui/CMakeLists.txt -index 8c36e5a..ddf17e1 100644 ---- a/src/stlink-gui/CMakeLists.txt -+++ b/src/stlink-gui/CMakeLists.txt -@@ -30,9 +30,9 @@ if (NOT WIN32) - - ## stlink-gui - add_executable(stlink-gui ${GUI_SOURCES}) -- install(FILES stlink-gui.ui DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(FILES stlink-gui.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/stlink) - set_target_properties(stlink-gui PROPERTIES -- COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_INSTALL_PREFIX}/bin") -+ COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_INSTALL_DATAROOTDIR}/stlink") - target_link_libraries(stlink-gui ${STLINK_LIB_SHARED} ${SSP_LIB} ${GTK3_LDFLAGS}) - install(TARGETS stlink-gui DESTINATION ${CMAKE_INSTALL_BINDIR}) - --- -2.30.2 - diff --git a/app-devel/stlink/autobuild/prepare b/app-devel/stlink/autobuild/prepare index d6b52500645..4c925d78e53 100644 --- a/app-devel/stlink/autobuild/prepare +++ b/app-devel/stlink/autobuild/prepare @@ -1,9 +1,3 @@ -abinfo "Fedora: Fixing installation directories ..." -sed -e 's|/${PROJECT_NAME}||g' \ - -i "$SRCDIR"/src/stlink-gui/CMakeLists.txt -sed -e 's|/${PROJECT_NAME}||g' \ - -i "$SRCDIR"/doc/man/CMakeLists.txt - abinfo "Fedora: Also include cmake/pkgconfig ..." sed -e 's|#add_subdirectory(cmake/pkgconfig)|add_subdirectory(cmake/pkgconfig)|' \ -i "$SRCDIR"/CMakeLists.txt diff --git a/app-devel/stlink/spec b/app-devel/stlink/spec index dc7aa3041d6..fce4b7a88a3 100644 --- a/app-devel/stlink/spec +++ b/app-devel/stlink/spec @@ -1,5 +1,4 @@ -VER=1.6.1 -REL=1 -SRCS="tbl::https://github.com/texane/stlink/archive/v$VER.tar.gz" -CHKSUMS="sha256::ca9a640f84c3e2c9873bd51759594bc05c00cdf6e1f21b434ae2c0e7985433d8" +VER=1.7.0 +SRCS="git::commit=tags/v$VER::https://github.com/texane/stlink" +CHKSUMS="SKIP" CHKUPDATE="anitya::id=227275"