Bjørn Forsman
c6d516dfc4
wrapQtAppsHook: use patchelf --print-interpreter instead of isELFExec
...
Some executables are built as PIEs (e.g. keepassxc) and are technically
isELFDyn, not isELFExec. Without this change those executables will not
be wrapped.
2019-09-13 16:53:11 +02:00
Jan Tojnar
a441eaa7b1
Merge branch 'staging-next' into staging
2019-09-12 22:49:43 +02:00
Nathan van Doorn
4535178a37
qt59.qtscript: fix error due to gcc8.3
2019-09-11 13:33:38 +01:00
Nathan van Doorn
a4ace375d2
qt511.qtscript: fix error due to gcc8.3
2019-09-11 13:32:53 +01:00
Dima
6f1ad0676f
qtwebkit: fixing build / reducing build log size
...
GCC 8 introduced a new type of warning `-Wclass-memaccess` which
is included in `-Wall`. This warnings spits out *a million* of warnings
like the following:
```
[...]
/build/source/Source/WTF/wtf/Vector.h:128:15: warning: 'void* memcpy(void*, const void*, size_t)' writing to an object of type 'class WTF::RefPtr<WebCore::TransformOperation>' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess]
memcpy(dst, src, reinterpret_cast<const char*>(srcEnd) - reinterpret_cast<const char*>(src));
[...]
``
Logs demonstrating the issue:
https://hydra.nixos.org/build/100205478/nixlog/1
While I don't think disabling warnings is the best way to deal with this,
there is alrady precedent for this package and I don't feel confident enough
to either patch or bump this package.
Please view this as a low-friction sub-optimal suggestion in case nobody else
has a better fix.
2019-09-10 18:42:30 +02:00
Izorkin
329a88efa7
treewide: replace mysql.connector-c to libmysqlclient
2019-09-09 15:55:34 +03:00
Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Matthew Bauer
70c1c856d4
qtbase: remove sdk.mk check for macOS
2019-08-26 00:19:48 -04:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
...
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster
3dede565c7
qt56: remove; unused, broken with openssl 1.1
2019-08-22 14:50:28 +02:00
Robin Gloster
f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1
2019-08-21 14:25:13 +02:00
Florian Klink
88146a095f
wrapQtAppsHook: use isELFExec
...
This ensures we only wrap executables, not shared libraries
2019-08-17 16:45:57 +02:00
Frederik Rietdijk
cff9e6429a
Merge staging-next into staging
2019-08-14 13:46:33 +02:00
Frederik Rietdijk
8d56f2472e
Merge master into staging-next
2019-08-14 13:45:54 +02:00
Averell Dalton
658ffb06d6
pkgsi686Linux.qt5.qtbase: fix build
2019-08-08 20:14:55 +02:00
Thomas Tuegel
3a2a980787
Revert "Revert "qt512: Update qtbase.patch""
...
This reverts commit c220e00d7a
2019-08-06 14:43:04 -05:00
Thomas Tuegel
469d17a3f0
Revert "Revert "qt 5.12.0 -> 5.12.3""
...
This reverts commit bf39fc17d4
2019-08-06 14:42:51 -05:00
Thomas Tuegel
421782edb1
Merge pull request #65526 from samueldr/feature/qt-strict-compatible-versions
...
qt5*: Enforce strict compatible version paths
2019-08-02 15:04:04 -05:00
Robin Gloster
30969073f0
Merge remote-tracking branch 'upstream/master' into openssl-1.1
2019-08-02 03:01:30 +02:00
Frederik Rietdijk
55e4555b77
Merge master into staging-next
2019-08-01 09:42:54 +02:00
Samuel Dionne-Riel
6cb99e79ed
qt512: Enforce strict compatible version paths
2019-07-30 20:33:22 -04:00
Samuel Dionne-Riel
4d0bff9f31
qt511: Enforce strict compatible version paths
2019-07-30 20:33:22 -04:00
Samuel Dionne-Riel
fb96e450b4
qt59: Enforce strict compatible version paths
2019-07-30 20:33:22 -04:00
Samuel Dionne-Riel
ed50ec8129
qt56: Enforce strict compatible version paths
2019-07-30 20:33:21 -04:00
Vladimír Čunát
3ce29412bd
qt59.qtbase: fix with openssl-1.1.0 via ported Fedora patch
2019-07-29 21:25:14 +02:00
Frederik Rietdijk
bf39fc17d4
Revert "qt 5.12.0 -> 5.12.3"
...
Segmentation faults. See https://github.com/NixOS/nixpkgs/issues/65448
This reverts commit 552803f6f5
2019-07-28 12:16:29 +02:00
Frederik Rietdijk
c220e00d7a
Revert "qt512: Update qtbase.patch"
...
Segmentation faults. See https://github.com/NixOS/nixpkgs/issues/65448
This reverts commit 02afb228e2
2019-07-28 12:16:29 +02:00
Thomas Tuegel
299e9345a8
Revert "qtbase: Fix paths returned by qmake -query"
2019-07-26 18:53:12 -05:00
Frederik Rietdijk
db6c38a075
Merge master into staging-next
2019-07-22 14:15:32 +02:00
worldofpeace
7d6ab0ad7a
wrapQtAppsHook: use isELF
...
We should still prevent things like
scripts from being wrapped.
2019-07-17 15:53:15 -04:00
worldofpeace
4908d382ae
wrapQtAppsHook: remove isQtApp
...
This was preventing dolphin from being wrapped.
2019-07-16 20:37:43 -04:00
worldofpeace
6c057aea5c
wrapQtAppsHook: wrap binaries in libexec
2019-07-16 17:26:17 -04:00
Thomas Tuegel
e92a2f2fc2
Merge pull request #57097 from FlorianFranzen/qmake-header
...
qtbase: Fix paths returned by qmake -query
2019-07-15 08:48:23 -05:00
Frederik Rietdijk
4aee94629d
Merge staging-next into staging
2019-07-13 09:46:03 +02:00
Frederik Rietdijk
54065ae20d
Merge master into staging-next
2019-07-13 09:45:40 +02:00
Thomas Tuegel
02afb228e2
qt512: Update qtbase.patch
2019-07-12 14:12:52 +02:00
Jos van den Oever
552803f6f5
qt 5.12.0 -> 5.12.3
2019-07-12 14:12:52 +02:00
arcnmx
eda2dbaab2
qt512.qtwebengine: darwin patch
...
This patch is currently applied to 5.11, allowing it to begin building;
both packages fail to compile regardless, but it's an improvement.
2019-07-11 10:23:30 -07:00
Thomas Tuegel
56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
...
Wrap Qt applications
2019-07-05 14:38:10 -05:00
Thomas Tuegel
f79fd2e826
wrapQtAppsHook: wrap Qt applications for runtime dependencies
2019-07-05 10:41:41 -05:00
Daiderd Jordan
cbfbe9ca1e
qt: remove cf-private
2019-07-03 22:20:16 +02:00
Matthew Bauer
4c3e09b022
qt5.12: patch to work on x86_64-darwin
...
unfortunately, some private headers making the logging hard to handle.
Specifically, os/activity.h that is included does not match what Qt5
is expected. This removes the activity logging (while keeping the
other logging methods) on macOS.
Fixes #63528
2019-06-23 18:29:04 -04:00
Matthew Bauer
79c0e740a7
qttools: patch qmlimportscanner for darwin builds
...
This needs to be the full path for qtmacdeploy to work. We add
${qt5.qttools.dev}/bin/qmlimportscanner as the default.
Fixes #63093
2019-06-22 22:21:38 -04:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Matthew Bauer
c4fc74b19c
qtwebengine: don’t use gn configure
...
qtwebengine has its own configure script, so don’t try to use gn.
2019-06-03 21:42:59 -04:00
worldofpeace
53afb548a5
Merge pull request #60035 from nyanloutre/kdeapps_update
...
kde_applications: 18.12.03 -> 19.04.1; kdeFrameworks: 5.56 -> 5.58; plasma-5: 5.15.3 -> 5.15.5
2019-05-23 14:36:03 -04:00
Jos van den Oever
044cd208b7
kdepim-runtime: replace sed by a proper patch
...
- remove unused qca-qt5
2019-05-20 20:18:00 -04:00
nyanloutre
895e78c9bc
qt5.qtnetworkauth: init
2019-05-20 20:17:59 -04:00
worldofpeace
bcc56cbce6
Merge pull request #60420 from dtzWill/fix/qtwebkit-libgdk-from-gtk-apparently
...
qtwebkit: fix path for libgdk-x11-2.0, it's in gtk2 apparently
2019-05-19 00:28:11 -04:00
Frederik Rietdijk
0196d8f11c
Merge master into staging-next
2019-05-07 09:00:06 +02:00
volth
5ad79dc4bb
compilation for particular x86_64 architecture
2019-04-30 14:28:04 +00:00
Will Dietz
c29b17eecb
qtwebkit: fix path for libgdk-x11-2.0, it's in gtk2 apparently
2019-04-29 08:10:09 -05:00
Matthew Bauer
c1f1a0ea15
qt5: use llvm5 for all modules
...
This avoids some issues encountered with qt5 not working libcxx 7. We
can remove this at some point when qt5 has addressed all of their issues.
2019-04-26 21:55:12 -04:00
Matthew Bauer
da38a49a24
treewide: mark bad packages
...
Some old stuff is known not to work.
2019-04-26 21:55:11 -04:00
Matthew Bauer
0fe315c9b6
treewide: remove old patches for macOS
...
These shouldn’t be needed now that we are on macOS 10.12.
2019-04-26 21:54:32 -04:00
Jan Tojnar
cb1a20499a
Merge branch 'master' into staging
2019-04-05 11:37:15 +02:00
nyanloutre
4b7d9dc868
fetch-kde-qt.sh: get hashes from metadata
2019-03-27 22:16:18 -04:00
Dmitry Kalinkin
0624deb5df
qt59.qtwebengine: fix on darwin
...
This ports a patch that is already used in 5.11. Also one of the
substituteInPlace call fails because a file doesn't exist.
2019-03-26 16:30:58 -04:00
Dmitry Kalinkin
ccd1bf610d
qt5.qtwebengine: refactor more things to use patches instead of substituteInPlace
...
qt59.qtwebengine doesn't need those fixes (probably since the recent
minor version bump)
2019-03-26 16:30:58 -04:00
Dmitry Kalinkin
1809832958
qt5.qtwebengine: disable platform check using patches
...
The previous code using substituteInPlace was broken for both 5.9 and
5.11 (latter was broken after a minor release bump). Using patches
should make things fail loudly and prevent modules/qtwebengine.nix from
being littered with version checks.
The patch for 5.12 is only tested to apply.
2019-03-26 16:30:50 -04:00
Wael M. Nasreddine
5af0780492
Merge remote-tracking branch 'origin/master' into staging
...
* origin/master: (693 commits)
buildGoModule: use go_1_12 instead of go_1_11 (#58103 )
gitAndTools.lab: 0.15.2 -> 0.15.3 (#58091 )
signal-desktop: 1.22.0 -> 1.23.0
added missing semicolon to documentation
terminus_font_ttf: 4.46.0 -> 4.47.0
buildGoModule: remove SSL env vars in favor of cacert in buildInputs (#58071 )
dav1d: init at 0.2.1
dropbox-cli: 2018.11.28 -> 2019.02.14
atlassian-confluence: 6.14.1 -> 6.14.2
maintainers: update email for dywedir
python.pkgs.hglib: use patch to specify hg path (#57926 )
chkrootkit: 0.52 -> 0.53
radare2-cutter: 1.7.2 -> 1.8.0
autorandr: 1.7 -> 1.8
pythonPackages.pyhepmc: fix build
llvm-polly/clang-polly: use latest llvm
apulse: 0.1.11.1 -> 0.1.12, cleanup
factorio: experimental 0.17.14 → 0.17.16 (#58000 )
sequeler: 0.6.7 -> 0.6.8
nasc: 0.5.1 -> 0.5.2
...
2019-03-21 21:01:25 -07:00
Anton Kindestam
b22d92fb6d
qt512: patch qtwebengine against CVE-2019-5786
2019-03-13 22:27:01 +01:00
Matthew Bauer
37eba81c7b
Merge pull request #56391 from matthewbauer/cmake-treewide
...
Add more CMake flags
2019-03-11 12:43:46 -04:00
Matthew Bauer
6ed49262f5
treewide: remove BUILD_TESTING flag
...
This is now set by CMake
2019-03-11 10:11:28 -04:00
Florian Franzen
0b059cc956
qtbase: Fix paths returned by qmake -query
2019-03-09 20:46:23 +01:00
Frederik Rietdijk
5d7ab31949
Merge master into staging-next
2019-03-05 08:32:52 +01:00
Dmitry Kalinkin
4a62576c12
Merge pull request #55983 from veprbl/pr/qt5_qtwebkit_darwin_fix
...
qt511.qtwebkit: fix on darwin
2019-03-03 11:01:47 -05:00
Frederik Rietdijk
35e73c9dd5
Merge staging into staging-next
2019-03-03 09:35:42 +01:00
Pedro Pombeiro
080612a870
qt5.full: add qtwebview module to 5.11 and 5.12 packages
2019-03-02 09:50:08 +01:00
Will Dietz
5937a19a06
qtbase: let build use gold linker if it wants, maybe works now
2019-02-28 22:31:38 -06:00
Dmitry Kalinkin
518f997eb5
qt5.qtwebkit: don't set qmake variables for cmake build
2019-02-19 23:52:07 -05:00
Dmitry Kalinkin
4bbd00e934
qt511.qtwebkit: fix on darwin
...
readline is used on macOS and iOS for some javascript console (JSC). It
seems to be easier to disable it than to fix it.
2019-02-19 23:52:06 -05:00
Dmitry Kalinkin
67186defda
qt5.qtwebkit: refactor version comparison
...
This introduces usingAnnulenWebkitFork variable. Using version
check for qtbase.version is misleading because annulen's fork is not
tied to a specific qt5 release.
2019-02-19 23:51:24 -05:00
Dmitry Kalinkin
f212dd2e32
qt5.qtwebkit: link against libicucore.dylib from darwin.ICU instead of /usr/lib
...
The impure library was introduced in
775531c1e3
2019-02-19 23:51:19 -05:00
Matthew Bauer
8724819d94
Merge pull request #55910 from veprbl/pr/qt5_qtconnectivity_darwin_fix
...
qt5.qtconnectivity: fix darwin build
2019-02-19 22:37:15 -05:00
Dmitry Kalinkin
3e3e3918f2
qt5.qtwebengine: fail properly
...
QtWebEngine's build system is setup to perform certain platform checks
(see mkspecs/features/platform.prf). But a failed check will not cause
configuration phase to fail, but instead it configures no build targets.
So in such case the build will successfully perform build and install
phases. An empty output directories will are produced and the build
succeeds.
This patches qtwebengine qmake files to properly fail during
configuration phase.
This doesn't touch qt56 as it doesn't have this mechanism.
2019-02-19 12:28:15 -05:00
Dmitry Kalinkin
4bf4484515
qt5.qtconnectivity: fix darwin build
2019-02-16 18:13:58 -05:00
Vladimír Čunát
ff101946a8
Merge branch 'master' into staging-next
...
Hydra nixpkgs: ?compare=1503899
2019-02-06 14:24:46 +01:00
Matthew Bauer
81531046e8
qt511: add patch for macOS sdk
...
Unfortunately we don’t have access to NSWindowStyleMask. These patches
should go away once we switch to a newer SDK.
2019-02-05 20:50:52 -05:00
Vladimír Čunát
5effa4e0f9
Merge branch 'master' into staging-next
...
Comments on conflicts:
- llvm: d6f401e1469ecc70
2019-02-01 09:22:29 +01:00
Andreas Rammhold
2f5d37b77b
qt511: 5.11.1 -> 5.11.3
...
This fixes
* CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader
* CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file
* CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler
* CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion
* CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses
* CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference
More details can be obtained from the Qt annoucement [1].
[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/
2019-01-31 11:00:27 +01:00
Andreas Rammhold
066be85d9d
qt56: fix CVE-2018-{15518,19873,19870,19871,19865,19869}
...
* CVE-2018-15518, Qt Base: “double free or corruption” in QXmlStreamReader
* CVE-2018-19873, Qt Base: QBmpHandler segfault on malformed BMP file
* CVE-2018-19870, Qt Base: Check for QImage allocation failure in qgifhandler
* CVE-2018-19871, Qt Imageformats: QImage: QTgaFile CPU exhaustion
* CVE-2018-19865, Qt Virtual Keyboard: Qt Virtual Keyboard logs all key presses
* CVE-2018-19869, Qt Svg: Fix crash when parsing malformed url reference
More details can be obtained from the Qt annoucement [1].
[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/
2019-01-31 00:50:29 +01:00
Andreas Rammhold
295a210a23
qt56.qtvirtualkeyboard: init at 5.6.3
...
This adds the "missing" qtvirtualkeyboard module of qt56. I just add
this so I can apply (& test) the patches for a CVE in the next commit.
This might seem strange but in case anyone decided to add / use this in
the future we are on the safe(r) side.
2019-01-31 00:21:51 +01:00
Andreas Rammhold
66601282cc
qt59.qtvirtualkeyboard: fix CVE-2018-19865
...
CVE-2018-19865 tracks the issue of qtvirtualkeyboard where it logs all
user input. With this commit we are applying the recommended patches
form the upstream project.
More details can be obtained from the Qt annoucement [1].
[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/
2019-01-30 23:50:48 +01:00
Dmitry Kalinkin
571e44b5b8
Merge pull request #54787 from FlorianFranzen/qt59
...
qt59: 5.9.3 -> 5.9.7
2019-01-29 15:43:57 -05:00
Dmitry Kalinkin
fd75bbccb9
Revert "qt59-qtbase: fix darwin build with clang-5"
...
The fix is already included in Qt 5.9.7
This reverts commit 0bf153f9c0
2019-01-28 19:53:52 -05:00
Silvan Mosberger
ddcf01bca6
Merge pull request #53848 from veprbl/pr/qtwebengine_darwin_fix
...
qt511.qtwebengine: fix on darwin
2019-01-28 02:41:53 +01:00
Dmitry Kalinkin
56dcf6e1f6
qt5.qtwebengine: refactor to use lib.versionOlder
2019-01-27 19:01:17 -05:00
Florian Franzen
776c96272c
qt59: 5.9.3 -> 5.9.7
2019-01-26 17:01:23 +01:00
Dmitry Kalinkin
ecbb9d3639
qt5.qtwebengine: don't propagate cups dependency
2019-01-20 14:57:59 -05:00
Frederik Rietdijk
f8b45e2d84
Merge staging-next into staging
2019-01-19 09:24:01 +01:00
Anthony Cowley
5fc5f15206
qtxmlpatterns: fix dependency with qtdeclarative
...
In Qt-5.12, the order of the dependency between these two packages
flipped.
A symptom of the problem is an error like, `module
"QtQuick.XmlListModel" is not installed`.
The upstream changes that this reflects are in qtxmlpatterns
<8c6e24329e0477a057fd
2019-01-16 20:57:29 -05:00
Trolli Schmittlauch
4b76c4605e
qt511.qtdeclarative: fix CMake qmlcachegen path
...
This package contains several CMake files used for setting up its
provided tools for use in other projects build with CMake.
While packaging *ktouch* I found out that the ${_qt5Core_install_prefix}
variable doesn't expand at all, rendering the path to the `qmlcachegen`
binary useless. As a fix, the command itself is used instead of the path
to the binary.
2019-01-13 00:09:38 +01:00
Dmitry Kalinkin
45ab55e6e2
qt511.qtwebengine: fix build on darwin
...
Co-Authored-By: Josef Kemetmüller <josef.kemetmueller@gmail.com>
2019-01-12 16:40:06 -05:00
Frederik Rietdijk
10afccf145
Merge staging-next into staging
2018-12-27 18:11:34 +01:00
Orivej Desh
5c5c83fb4e
qt5: update nixpkgs directory in readme
2018-12-26 20:21:35 +00:00
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv
...
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277
This removes now also paxutils from stdenv.
2018-12-22 12:55:05 +01:00
Bastian Köcher
8e811ec295
qt5: 5.11 -> 5.12
2018-12-19 09:15:14 +01:00
Nicolas Schneider
bf3a98ce04
Fix qtbase cmake for gui plugins [Qt 5.6, 5.9]
...
This is 54377280f0
2018-12-01 21:09:33 +01:00
