JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
194,962 Commits 2 Branches 0 Tags 12 GiB
b67d28a90b
Commit Graph

590 Commits

Author SHA1 Message Date
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'" 
This reverts commit f8a8fc6c7c.
 2019-09-22 09:38:09 +02:00
worldofpeace
15e99a06a8 wrapQtAppsHook: correct skip directories heuristic 2019-09-20 19:10:02 -04:00
worldofpeace
f21f980ab8 qt5.qtwebengine: reduce log output 
Identical fix as 6f1ad0676f.
 2019-09-15 19:20:45 -04:00
Bjørn Forsman
d6e65ec4a0 wrapQtAppsHook: skip directories 
Prevents messages like this in the build log:

  grep: <PATH>/bin: Is a directory
 2019-09-13 16:53:11 +02:00
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
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
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