Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stellarium 24.1 #10271

Merged
merged 1 commit into from
Mar 30, 2024
Merged

Stellarium 24.1 #10271

merged 1 commit into from
Mar 30, 2024

Conversation

alex-w
Copy link
Contributor

@alex-w alex-w commented Mar 29, 2024

Updating Stellarium to version 24.1

@alex-w alex-w requested a review from Begasus March 29, 2024 17:27
@Begasus
Copy link
Contributor

Begasus commented Mar 29, 2024

There's still another trailing whitespace ;)

@alex-w
Copy link
Contributor Author

alex-w commented Mar 30, 2024

There's still another trailing whitespace ;)

Done

@Begasus
Copy link
Contributor

Begasus commented Mar 30, 2024

Thanks! Is it possible there to squash the commits at your end? (last request) :)

Remove patch for previous series

Add wrapper

Update stellarium-24.1.recipe
Update recipe

remove whitespace from comment

fix revision number
@Begasus Begasus merged commit 3d8eb0f into haikuports:master Mar 30, 2024
1 check passed
@Begasus
Copy link
Contributor

Begasus commented Mar 30, 2024

Thanks! +1

@OscarL
Copy link
Contributor

OscarL commented Mar 30, 2024

Build failed on both 32 (log) and 64 bits (log).

Same error on both:

[ 43%] Building C object src/external/CMakeFiles/glues_stel.dir/glues_stel/source/glues_error.c.o
In file included from /boot/system/develop/headers/x86/Qt6/QtCore/qglobal.h:37,
                from /boot/system/develop/headers/x86/Qt6/QtGui/qtguiglobal.h:7,
                from /boot/system/develop/headers/x86/Qt6/QtGui/qopengl.h:7,
                from /sources/stellarium-24.1/src/external/glues_stel/source/glues_error.c:37:
/boot/system/develop/headers/x86/Qt6/QtCore/qtypes.h:159:15: error: expected declaration specifiers or '...' before 'sizeof'
 159 | static_assert(sizeof(ptrdiff_t) == sizeof(size_t), "Weird ptrdiff_t and size_t definitions");
     |               ^~~~~~
/boot/system/develop/headers/x86/Qt6/QtCore/qtypes.h:159:52: error: expected declaration specifiers or '...' before string constant
 159 | static_assert(sizeof(ptrdiff_t) == sizeof(size_t), "Weird ptrdiff_t and size_t definitions");
     |                                                    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
src/external/CMakeFiles/glues_stel.dir/build.make:81: recipe for target 'src/external/CMakeFiles/glues_stel.dir/glues_stel/source/glues_error.c.o' failed
make[2]: *** [src/external/CMakeFiles/glues_stel.dir/glues_stel/source/glues_error.c.o] Error 1
CMakeFiles/Makefile2:3218: recipe for target 'src/external/CMakeFiles/glues_stel.dir/all' failed
make[1]: *** [src/external/CMakeFiles/glues_stel.dir/all] Error 2
Makefile:155: recipe for target 'all' failed
make: *** [all] Error 2

@alex-w
Copy link
Contributor Author

alex-w commented Mar 31, 2024

This is weird. It’s building and running in my Haiku (in VirtualBox) without problem. The second weird point - troubles in Qt sources (according to logs).

@threedeyes
Copy link
Member

This is weird. It’s building and running in my Haiku (in VirtualBox) without problem. The second weird point - troubles in Qt sources (according to logs).

static_assert is missing in beta4, it was only recently added. You should use _Static_assert instead, you can simply override it via #define static_assert _Static_assert

@alex-w
Copy link
Contributor Author

alex-w commented Mar 31, 2024

static_assert is missing in beta4, it was only recently added. You should use _Static_assert instead, you can simply override it via #define static_assert _Static_assert

But how it is possible - the previous port (v1.0 - it was released in 2022) was successful built and the part of "problematic" code was not changed since 2017. Moreover, the line 37 in glues_error.c file has #include for Qt's OpenGL wrapper.

P.S. Right now I updated haikuports tree and run haikuporter for building Stellarium 24.1 recipe

@alex-w alex-w deleted the stellarium-24.1 branch March 31, 2024 06:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants