JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,689 Commits 2 Branches 0 Tags 13 GiB
e6889d46e0
Commit Graph

107 Commits

Author SHA1 Message Date
Dima
3bfe0872b9 qt5.{qtwebengine, qtwebkit}: fix -Wno-class-memaccess warning for clang 
With a previous fix for log size issues due to GCC 8
a gcc specific `-W` flag was added that clang does
not know, so it spams the logs.
 2019-10-07 04:12:26 +02:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'" 
This reverts commit f8a8fc6c7c.
 2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'" 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
 2019-09-21 20:05:09 +02:00
Vladimír Čunát
fa4a3af5a7
Merge branch 'master' into staging-next 2019-09-16 19:24:52 +02:00
worldofpeace
f21f980ab8 qt5.qtwebengine: reduce log output 
Identical fix as 6f1ad0676f.
 2019-09-15 19:20:45 -04:00
Jan Tojnar
a441eaa7b1
Merge branch 'staging-next' into staging 2019-09-12 22:49:43 +02: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
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
Frederik Rietdijk
cff9e6429a Merge staging-next into staging 2019-08-14 13:46:33 +02:00
Averell Dalton
658ffb06d6 pkgsi686Linux.qt5.qtbase: fix build 2019-08-08 20:14:55 +02: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
Frederik Rietdijk
55e4555b77 Merge master into staging-next 2019-08-01 09:42:54 +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
Thomas Tuegel
299e9345a8
Revert "qtbase: Fix paths returned by qmake -query" 2019-07-26 18:53:12 -05: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
Jos van den Oever
552803f6f5 qt 5.12.0 -> 5.12.3 2019-07-12 14:12:52 +02: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
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
Vladimír Čunát
2771375d6e
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1512490
 2019-04-02 20:56:53 +02: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
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 ('qt58: extend darwin compatibility')

cmake-based build can use a non-apple ICU if -DMACOS_USE_SYSTEM_ICU=OFF
is set.
 2019-02-19 23:51:19 -05:00