[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ring-kde] cmake: lrc: Use the master branch for the Ring-LRC fork.
From:       Emmanuel Lepage Vallee <null () kde ! org>
Date:       2017-08-01 3:47:01
Message-ID: E1dcO97-0003ZY-Mx () code ! kde ! org
[Download RAW message or body]

Git commit 0e5ec03ce636590baa0209f678d483a1c7f40b00 by Emmanuel Lepage Vall=
ee.
Committed on 01/08/2017 at 03:32.
Pushed by lepagevalleeemmanuel into branch 'master'.

lrc: Use the master branch for the Ring-LRC fork.

This project no longer use the upstream ring-lrc. It is now mostly
unmaintained and the 2 maintainers that took over after me left
the project. Given the size and velocity of the changes, trying
to upstream the patches was no longer viable. The project will
soon be merged back into this repository (where it started).

M  +2    -2    cmake/FetchRing-LRC.cmake

https://commits.kde.org/ring-kde/0e5ec03ce636590baa0209f678d483a1c7f40b00

diff --git a/cmake/FetchRing-LRC.cmake b/cmake/FetchRing-LRC.cmake
index 601e6b79..a990ce0e 100644
--- a/cmake/FetchRing-LRC.cmake
+++ b/cmake/FetchRing-LRC.cmake
@@ -59,11 +59,11 @@ message(STATUS "Fetching Ring-LRC from GitHub")
 =

 if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/ring-lrc)
     execute_process(COMMAND
-        git clone https://github.com/Elv13/ring-lrc.git --branch work5 ${C=
MAKE_CURRENT_BINARY_DIR}/ring-lrc
+        git clone https://github.com/Elv13/ring-lrc.git --branch master ${=
CMAKE_CURRENT_BINARY_DIR}/ring-lrc
     )
 else()
     execute_process(COMMAND
-        /bin/sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/ring-lrc && git fetch o=
rigin && git reset --hard origin/work5"
+        /bin/sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/ring-lrc && git fetch o=
rigin && git reset --hard origin/master"
     )
 endif()
 =


[prev in list] [next in list] [prev in thread] [next in thread]