* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/
@ 2019-05-18 19:52 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2019-05-18 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 967ffe2ac3852a1c8fa5e7505ab49e770575cb5c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 19:49:33 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 18 19:51:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967ffe2a
sci-astronomy/stellarium: Source upstream patch
Mixed CRLF, LF line terminators...
Closes: https://bugs.gentoo.org/686250
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/stellarium-0.19.0-static.patch | 33 ++++++++++++++++------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/sci-astronomy/stellarium/files/stellarium-0.19.0-static.patch b/sci-astronomy/stellarium/files/stellarium-0.19.0-static.patch
index 9675d389f20..ec2ae5ba2be 100644
--- a/sci-astronomy/stellarium/files/stellarium-0.19.0-static.patch
+++ b/sci-astronomy/stellarium/files/stellarium-0.19.0-static.patch
@@ -1,3 +1,20 @@
+From d280caa72fbbcd362b820a71a01d4f0e2c1a3bcb Mon Sep 17 00:00:00 2001
+From: Alexey Sokolov <sokolov@google.com>
+Date: Sat, 18 May 2019 08:28:31 +0100
+Subject: [PATCH] Fix build with cmake -DBUILD_SHARED_LIBS=ON (#683)
+
+Ref https://github.com/gentoo/gentoo/pull/11770
+---
+ plugins/TelescopeControl/src/INDI/CMakeLists.txt | 2 +-
+ plugins/TelescopeControl/src/Lx200/CMakeLists.txt | 2 +-
+ plugins/TelescopeControl/src/NexStar/CMakeLists.txt | 2 +-
+ plugins/TelescopeControl/src/Rts2/CMakeLists.txt | 2 +-
+ plugins/TelescopeControl/src/common/CMakeLists.txt | 2 +-
+ plugins/TelescopeControl/src/gui/CMakeLists.txt | 2 +-
+ src/CMakeLists.txt | 2 +-
+ src/external/CMakeLists.txt | 2 +-
+ 8 files changed, 8 insertions(+), 8 deletions(-)
+
diff --git a/plugins/TelescopeControl/src/INDI/CMakeLists.txt b/plugins/TelescopeControl/src/INDI/CMakeLists.txt
index 40c27601a0..a250e1bb0f 100644
--- a/plugins/TelescopeControl/src/INDI/CMakeLists.txt
@@ -94,11 +111,11 @@ index 42a073e828..4c56837314 100644
--- a/src/external/CMakeLists.txt
+++ b/src/external/CMakeLists.txt
@@ -190,7 +190,7 @@ IF(USE_PLUGIN_TELESCOPECONTROL)
- include_directories(libindi)
- include_directories(libindi/libs)
- include_directories(libindi/libs/indibase)
-- add_library(indiclient
-+ add_library(indiclient STATIC
- libindi/libs/lilxml.c
- libindi/base64.c
- libindi/libs/indibase/basedevice.h
+ include_directories(libindi)
+ include_directories(libindi/libs)
+ include_directories(libindi/libs/indibase)
+- add_library(indiclient
++ add_library(indiclient STATIC
+ libindi/libs/lilxml.c
+ libindi/base64.c
+ libindi/libs/indibase/basedevice.h
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/
@ 2020-10-10 11:46 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-10-10 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 36feeb097ad8a44604ff04cda47fad12169139d9
Author: Alexey Sokolov <sokolov <AT> google <DOT> com>
AuthorDate: Sat Oct 10 10:16:19 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 11:46:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36feeb09
sci-astronomy/stellarium: fix patches
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 <AT> asokolov.org>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/stellarium-0.20.3-unbundle-indi.patch | 16 ++++----
.../stellarium-0.20.3-unbundle-qtcompress.patch | 44 +++++++++++-----------
.../files/stellarium-0.20.3-unbundle-zlib.patch | 28 +++++++-------
3 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
index ac3f84d5bb6..33d355f842f 100644
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-indi.patch
@@ -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)
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
index 7a585b71894..64b19a54c88 100644
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-qtcompress.patch
@@ -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
diff --git a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
index 37acb83e667..6fb7fb4f785 100644
--- a/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
+++ b/sci-astronomy/stellarium/files/stellarium-0.20.3-unbundle-zlib.patch
@@ -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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-10 11:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-10 11:46 [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2019-05-18 19:52 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox