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

Master #1312

Closed
wants to merge 10 commits into from
Closed

Master #1312

wants to merge 10 commits into from

Conversation

JPeterMugaas
Copy link
Contributor

Some new additions, and updates.

include libunwind
Lightweight system for writing, administering, and running unit tests in
C (mingw-w64)
Add HTTP/2 support through nghttp2 library and add metalink support
through libmetalink.
library for handling paper characteristic
Fix libelf so that you have do not have unrecognized format errors.
@@ -11,6 +11,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-libc++abi"
Copy link
Member

Choose a reason for hiding this comment

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

Increase pkgrel

patch -Np1 -i ${srcdir}/do-not-generate-import-library-for-executables.patch
patch -Np1 -i "${srcdir}/disable-response-files-for-msys.patch"
patch -Np1 -i "${srcdir}/dont-install-bundle.patch"
# patch -Np1 -i "${srcdir}/qt5-static-plugin-support.patch"
Copy link
Member

Choose a reason for hiding this comment

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

Why on earth have you disabled static plugin support?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The problem is that the patch does not compile properly with the new version of CMake 3.5.1. I have not figured out how to fix that.

Copy link
Member

Choose a reason for hiding this comment

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

But you can't just silently drop a patch in that instance, you break a whole lot of things. If that happens, then you forgo the update to cmake 3.5.1 instead. I spent weeks working on qt5-static and cmake-with-qt5-static, do you think it's reasonable to just break this without so much as a mention?

Copy link
Member

Choose a reason for hiding this comment

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

Please remove the broken cmake 3.5.1 upgrade from this patchset. It represents a serious regression.

I'm sorry for being harsh here and really do appreciate the efforts, but please in future don't try to slip something like this into an otherwise good PR.

@mingwandroid
Copy link
Member

Please do not merge this Alexey, he's disabled static plugin support for Qt5 (qt5-static) which is a unique (and used) MSYS2 feature.

@Alexpux
Copy link
Member

Alexpux commented Apr 12, 2016

@mingwandroid, yeah I forgot to mention it in comments. Thanks!

Revert Back to 3.4.1 until   qt5-static-plugin-support.patch can be
fixed.
@mingwandroid
Copy link
Member

Thanks @JPeterMugaas,

You can use git rebase -i to drop a commit from a series and then git push --force to update the pull request. It keeps the history cleaner.

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.

3 participants