Add pyside2ads and qtadvanceddocking recipe #19017
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index dd16157..c0997b5 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -86,6 +127,7 @@ set(shiboken_options --generator-set=shiboken --enable-parent-ctor-heuristic | ||
| --avoid-protected-hack --enable-pyside-extensions | ||
| ${qt_includes} ${ads_includes} | ||
| -I${CMAKE_SOURCE_DIR}/src | ||
| + -I$ENV{BUILD_PREFIX}/include/c++/v1/ | ||
| -T${PYSIDE_TYPESYSTEMS} | ||
| --output-directory=${CMAKE_CURRENT_BINARY_DIR} | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| {% set version = "3.8.2.1" %} | ||
| package: | ||
| name: pyside2ads | ||
| version: {{ version }} | ||
|
|
||
| source: | ||
| url: https://github.com/metgem/PySide2Ads/archive/v{{ version }}.tar.gz | ||
| sha256: 39b75119212dbc465590f11b5e36909949fcc34006d96b843205a4971e8c4bde | ||
| patches: | ||
| - 0001-libcxx.patch # [linux] | ||
|
|
||
| build: | ||
| number: 0 | ||
| script: {{ PYTHON }} -m pip install . -vv | ||
| script_env: | ||
| - CMAKE_GENERATOR_PLATFORM= # [win] | ||
| - CMAKE_GENERATOR_TOOLSET= # [win] | ||
| - CMAKE_GENERATOR= # [win] | ||
|
|
||
| requirements: | ||
| build: | ||
| - cmake | ||
| - {{ compiler('c') }} | ||
| - {{ compiler('cxx') }} | ||
| - clangdev | ||
| - {{ cdt('mesa-libgl-devel') }} # [linux] | ||
| - {{ cdt('mesa-dri-drivers') }} # [linux] | ||
| - {{ cdt('libselinux') }} # [linux] | ||
| - {{ cdt('libxdamage') }} # [linux] | ||
| - {{ cdt('libxxf86vm') }} # [linux] | ||
| - {{ cdt('libxext') }} # [linux] | ||
| - make # [not win] | ||
| - libcxx # [linux] | ||
|
There was a problem hiding this comment. This should be automatically installed by There was a problem hiding this comment.
There was a problem hiding this comment.
Is there a reason that this project cannot compile with There was a problem hiding this comment. I did not choose to use |
||
|
|
||
| host: | ||
| - python | ||
| - qt-main >=5.15 | ||
| - qtadvanceddocking | ||
| - pyside2 >=5.15 | ||
| - pip | ||
| - setuptools | ||
| - libclang | ||
| - xorg-libxfixes # [linux] | ||
|
|
||
| run: | ||
| - python | ||
| - qtadvanceddocking | ||
| - pyside2 >=5.15 | ||
|
|
||
| test: | ||
| imports: | ||
| - PySide2Ads | ||
| - PySide2Ads.QtAds | ||
|
|
||
| about: | ||
| home: https://github.com/metgem/PySide2Ads | ||
| license: LGPL-2.1-only | ||
| license_file: LICENSE | ||
| summary: PySide2 binding for Qt-Advanced-Docking-System | ||
|
|
||
| extra: | ||
| recipe-maintainers: | ||
| - n-elie | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| mesa-libGL | ||
| mesa-dri-drivers | ||
| libselinux | ||
| libXdamage | ||
| libXxf86vm | ||
| libXext |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/src/DockContainerWidget.h b/src/DockContainerWidget.h | ||
| index 06ea710..5f4e668 100644 | ||
| --- a/src/DockContainerWidget.h | ||
| +++ b/src/DockContainerWidget.h | ||
| @@ -107,7 +107,7 @@ protected: | ||
| /** | ||
| * Adds the given dock area to this container widget | ||
| */ | ||
| - void addDockArea(CDockAreaWidget* DockAreaWidget, DockWidgetArea area = CenterDockWidgetArea); | ||
| + void addDockArea(CDockAreaWidget* DockAreaWidget, DockWidgetArea area = ads::CenterDockWidgetArea); | ||
|
|
||
| /** | ||
| * Removes the given dock area from this container |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| mkdir build | ||
| cd build | ||
|
|
||
| cmake -LAH -G"NMake Makefiles" ^ | ||
| -DCMAKE_PREFIX_PATH="%LIBRARY_PREFIX%" ^ | ||
| -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^ | ||
| -DCMAKE_BUILD_TYPE=Release ^ | ||
| -DBUILD_STATIC=OFF ^ | ||
| -DBUILD_EXAMPLES=OFF ^ | ||
| -DADS_VERSION=%PKG_VERSION% ^ | ||
| .. | ||
| if errorlevel 1 exit 1 | ||
|
|
||
| cmake --build . --target install | ||
| if errorlevel 1 exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/bin/sh | ||
|
|
||
| mkdir build | ||
| cd build | ||
|
|
||
| cmake \ | ||
| ${CMAKE_ARGS} \ | ||
| -DCMAKE_PREFIX_PATH=${PREFIX} \ | ||
n-elie marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| -DCMAKE_INSTALL_PREFIX=${PREFIX} \ | ||
| -DCMAKE_BUILD_TYPE=Release \ | ||
| -DCMAKE_INSTALL_RPATH=${PREFIX}/lib \ | ||
| -DBUILD_STATIC=OFF \ | ||
| -DBUILD_EXAMPLES=OFF \ | ||
| -DADS_VERSION=${PKG_VERSION} \ | ||
| .. | ||
| make install -j${CPU_COUNT} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| {% set version = "3.8.2" %} | ||
|
|
||
| package: | ||
| name: qtadvanceddocking | ||
| version: {{ version }} | ||
|
|
||
| source: | ||
| url: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/{{ version }}.tar.gz | ||
| sha256: e56811228fb4d5f5703c31cd83cb39ab2d5a849f581719d383db72f9322ec7f2 | ||
| patches: | ||
| - 0001-CDockContainerWidget.patch | ||
|
|
||
| build: | ||
| number: 0 | ||
|
|
||
| requirements: | ||
| build: | ||
| - cmake | ||
| - {{ compiler('cxx') }} | ||
| - make # [not win] | ||
| - ninja # [win] | ||
| - {{ cdt('mesa-libgl-devel') }} # [linux] | ||
| - {{ cdt('mesa-dri-drivers') }} # [linux] | ||
| - {{ cdt('libselinux') }} # [linux] | ||
| - {{ cdt('libxdamage') }} # [linux] | ||
| - {{ cdt('libxxf86vm') }} # [linux] | ||
| - {{ cdt('libxext') }} # [linux] | ||
|
|
||
| host: | ||
| - qt-main >=5.15 | ||
|
|
||
| test: | ||
| commands: | ||
| - if not exist %LIBRARY_BIN%\\qtadvanceddocking.dll exit 1 # [win] | ||
| - if not exist %LIBRARY_INC%\\ads_globals.h exit 1 # [win] | ||
| - if not exist %LIBRARY_LIB%\\cmake\\qtadvanceddocking\\qtadvanceddockingConfig.cmake exit 1 # [win] | ||
| - test -f $PREFIX/lib/libqtadvanceddocking${SHLIB_EXT} # [unix] | ||
| - test -f $PREFIX/include/ads_globals.h # [unix] | ||
| - test -f $PREFIX/lib/cmake/qtadvanceddocking/qtadvanceddockingConfig.cmake # [unix] | ||
|
|
||
| about: | ||
| home: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System | ||
| license: LGPL-2.1-only | ||
| license_file: gnu-lgpl-v2.1.md | ||
| summary: Advanced Docking System for Qt | ||
|
|
||
| extra: | ||
| recipe-maintainers: | ||
| - n-elie |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My guess is that clangdev is only needed on macOS and it will be installed by the previous
compilerrequirement.Shouldn't that be removed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
clangdev seems to be needed on Linux, otherwise stddef.h is not found
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
stddef.h is not unique to clang it shouldn't require clangdev to be installed. Do you have a link to the spefic log output where this error occurred?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, you can find the log here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@carterbox Is there anything I can do for this PR to be accepted? Another package that I maintain (qtmolecularnetwork) also use clang and clangdev and was accepted
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In that recipe, the run_exports from clangdev are ignored.
https://github.com/conda-forge/qtmolecularnetwork-feedstock/blob/9c25b7f1b2f880255d23b0d90ff2622edebabd65/recipe/meta.yaml#L65