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

poppler: update to 24.11.0; fix the tests #19512

Merged
merged 1 commit into from
Nov 11, 2024

Conversation

AndWac
Copy link
Contributor

@AndWac AndWac commented Nov 9, 2024

No description provided.

@AndWac AndWac marked this pull request as draft November 9, 2024 22:12
include $(WS_MAKE_RULES)/common.mk

PATH= $(QT5_BINDIR):$(PATH.gnu)
PKG_CONFIG_PATH= $(PKG_CONFIG_PATH.$(BITS)):$(QT5_PKG_CONFIG_PATH)
PKG_CONFIG_PATH += $(QT5_PKG_CONFIG_PATH)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think PKG_CONFIG_PATH is not designed to work properly with +=. You probably should use PKG_CONFIG_PATH.prepend instead.

CMAKE_OPTIONS += -DENABLE_QT6=OFF
CMAKE_OPTIONS += -DQt5Core_DIR=$(QT5_LIBDIR)/cmake/Qt5Core
CMAKE_OPTIONS += -DQt5Gui_DIR=$(QT5_LIBDIR)/cmake/Qt5Gui
CMAKE_OPTIONS += -DQt5Xml_DIR=$(QT5_LIBDIR)/cmake/Qt5Xml
CMAKE_OPTIONS += -DQt5Widgets_DIR=$(QT5_LIBDIR)/cmake/Qt5Widgets
CMAKE_OPTIONS += -DQt5Test_DIR=$(QT5_LIBDIR)/cmake/Qt5Test
CMAKE_OPTIONS += -DTESTDATADIR=$(COMPONENT_DIR)/$(COMPONENT_NAME_1)-$(GIT_COMMIT_ID_1)

# Note that most tests are brokenon OpenIndiana
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brokenon?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

BTW, how this comment aligns with the results-all.master with the following results?

100% tests passed, 0 tests failed out of 65

@AndWac AndWac marked this pull request as ready for review November 11, 2024 07:57
@AndWac AndWac merged commit 72951b3 into OpenIndiana:oi/hipster Nov 11, 2024
1 check passed
@AndWac AndWac deleted the libpoppler-24.11.0 branch November 11, 2024 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants