gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sci-astronomy/stellarium: fix patches

Browse Source 
Somehow CRLF line endings were lost. Some files have CRLF line endings,
and some have LF only.

Bug: https://bugs.gentoo.org/745234
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Alexey Sokolov
2020-10-10 11:16:19 +01:00
committed by Joonas Niilola
parent 193c6fc338
commit 36feeb097a
3 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
View File

@@ -72,11 +72,11 @@ index 6fcf7678da..a59d8c121c 100644
--- a/src/external/CMakeLists.txt
+++ b/src/external/CMakeLists.txt
@@ -176,7 +176,7 @@ target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
################################# INDI ################################
-IF(USE_PLUGIN_TELESCOPECONTROL)
+IF(USE_PLUGIN_TELESCOPECONTROL AND 0)
set(INDI_SOVERSION "1")
set(CMAKE_INDI_VERSION_MAJOR 1)
set(CMAKE_INDI_VERSION_MINOR 6)
set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
################################# INDI ################################
-IF(USE_PLUGIN_TELESCOPECONTROL)
+IF(USE_PLUGIN_TELESCOPECONTROL AND 0)
set(INDI_SOVERSION "1")
set(CMAKE_INDI_VERSION_MAJOR 1)
set(CMAKE_INDI_VERSION_MINOR 6)

44
sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
View File

@@ -93,30 +93,30 @@ index 1e0e7e2b32..834aff89cb 100644
--- a/src/external/CMakeLists.txt
+++ b/src/external/CMakeLists.txt
@@ -70,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
+if(0)
set(qtcompress_SRCS
qtcompress/qzip.cpp
qtcompress/qzipreader.h
set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
+if(0)
set(qtcompress_SRCS
qtcompress/qzip.cpp
qtcompress/qzipreader.h
@@ -82,6 +83,7 @@ target_link_libraries(qtcompress_stel ${ZLIB_LIBRARIES} Qt5::Core)
#turn off automoc, not needed here
set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)
SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")
+endif()
set(qcustomplot_SRCS
qcustomplot/qcustomplot.cpp
#turn off automoc, not needed here
set_target_properties(qtcompress_stel PROPERTIES AUTOMOC 0)
SET_TARGET_PROPERTIES(qtcompress_stel PROPERTIES FOLDER "src/external")
+endif()
set(qcustomplot_SRCS
qcustomplot/qcustomplot.cpp
@@ -176,7 +176,7 @@
qxlsx/xlsxcelllocation.h
)
add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})
-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)
set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
################################# INDI ################################
qxlsx/xlsxcelllocation.h
)
add_library(qxlsx_stel STATIC EXCLUDE_FROM_ALL ${qxlsx_SRCS})
-target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui qtcompress_stel)
+target_link_libraries(qxlsx_stel Qt5::Core Qt5::Gui Qt5::Compress)
set_target_properties(qxlsx_stel PROPERTIES FOLDER "src/external")
################################# INDI ################################
diff -r 11536448457a xlsxzipreader.cpp
--- a/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:41:22 2020 +0100
+++ b/src/external/qxlsx/xlsxzipreader.cpp Thu Oct 08 21:42:03 2020 +0100

28
sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
View File

@@ -6,18 +6,18 @@ index 834aff89cb..590579e501 100644
--- a/src/external/CMakeLists.txt
+++ b/src/external/CMakeLists.txt
@@ -36,6 +36,7 @@ target_link_libraries(glues_stel Qt5::Gui)
set_target_properties(glues_stel PROPERTIES AUTOMOC 0)
SET_TARGET_PROPERTIES(glues_stel PROPERTIES FOLDER "src/external")
+if(0)
SET(zlib_SRCS
zlib/adler32.c
zlib/compress.c
set_target_properties(glues_stel PROPERTIES AUTOMOC 0)
SET_TARGET_PROPERTIES(glues_stel PROPERTIES FOLDER "src/external")
+if(0)
SET(zlib_SRCS
zlib/adler32.c
zlib/compress.c
@@ -69,6 +70,7 @@ target_include_directories(zlib_stel PUBLIC zlib)
#turn off automoc, not needed here
set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
+endif()
if(0)
set(qtcompress_SRCS
#turn off automoc, not needed here
set_target_properties(zlib_stel PROPERTIES AUTOMOC 0)
SET_TARGET_PROPERTIES(zlib_stel PROPERTIES FOLDER "src/external")
+endif()
if(0)
set(qtcompress_SRCS