Commit Graph

58 Commits

Author SHA1 Message Date
Bas van Dijk
9bafe42450 digikam: 5.7.0 -> 5.8.0
See: https://raw.githubusercontent.com/KDE/digikam/v5.8.0/project/NEWS.5.8.0
2018-01-09 20:54:37 +01:00
Vladimír Čunát
f29000b002
Merge branch 'master' into staging
Hydra: ?compare=1421760
2017-12-29 10:13:33 +01:00
Robin Gloster
a6bb022b15 digikam: mysql is not needed in buildInputs 2017-12-29 02:18:35 +01:00
gnidorah
c3efc32210 digikam: fix build 2017-12-24 12:54:20 +03:00
Orivej Desh
9b08b87f4d digikam: disable parallel building 2017-12-06 11:28:29 +00:00
Bastian Köcher
f2d8970aeb digikam: Fix empty album problem with Qt 5.9.3 2017-12-01 13:17:47 +01:00
Peter Hoeg
c41d794ecb digikam: minor cleanups 2017-10-23 22:49:46 +08:00
aszlig
27b7192726
digikam: 5.4.0 -> 5.7.0
The build for the version 5.4.0 of digiKam has been broken at the time
prior to this commit, which is the main reason for this update as I
don't think it makes sense to fix the build for 5.4.0 when we're going
to update it anyway.

A lot has changed upstream between version 5.4.0 and 5.7.0 and it's too
much to be summarized here, so here are the URLs to the upstream
announcements:

 * https://www.digikam.org/news/2017-03-14_digiKam_5.5.0_is_released/
 * https://www.digikam.org/news/2017-06-21-5.6.0-release-announcement/
 * https://www.digikam.org/news/2017-09-11-5.7.0_release_announcement/

On the packaging side, we now no longer have the patch that disables
-fno-operator-names because the build runs fine without that patch
(which didn't even apply but I didn't check why) and IMO it doesn't make
sense to rebase that patch for no reason.

Additionally, there were build time dependencies lurking around in
propagatedBuildInputs, which is kinda pointless and the application just
runs fine if those dependencies are listed in buildInputs.

While looking for clues about why that might be necessary I haven't
found any comment about it in the source nor a clarification within the
message of the commit where this has been introduced.

The commit in question is be7b7d908f.

Apart from these changes, the rest is just adding a few dependencies
(kcalcore, libksane, mesa and pcre) to get less errors during
cmakeConfigurePhase.

I've tested digiKam by playing around within a VM using photos I
netcat'ed into it and it works so far. The VM was built using:

nix-build nixos --arg configuration '{ pkgs, ... }: {
  imports = [ ./nixos/tests/common/user-account.nix ];
  environment.systemPackages = [ pkgs.digikam ];
  services.xserver.enable = true;
  services.xserver.displayManager.sddm.enable = true;
  services.xserver.desktopManager.plasma5.enable = true;
  services.xserver.desktopManager.default = "plasma5";
  virtualisation.memorySize = 1024;
}' -A vm

What I didn't test however was whether importing from a camera would
work (as I don't have one), but aside from that, the application seems
to run fine compared to the fact that it didn't even build until now :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @the-kenny, @urkud, @viric, @cillianderoiste, @ttuegel
Cc: @jraygauthier, @fkz, @sh01, @lsix
2017-10-19 04:42:53 +02:00
Thomas Tuegel
be7b7d908f
Remove kdeWrapper 2017-06-18 08:43:39 -05:00
jraygauthier
383706f36d digikam: add video support through libqtav (#24866)
* libqtav: init at unstable-2017-03-30

* digikam: add video support through `libqtav` dependency

Issue #24426.
2017-04-17 22:28:20 +02:00
Thomas Tuegel
127bf18a35
extra-cmake-modules: Lift Qt dependency 2017-02-27 11:49:46 -06:00
Thomas Tuegel
855690ba1d
Remove kde4.digikam
- Already updated to KDE 5 in Nixpkgs
2017-02-24 16:48:32 -06:00
Moritz Ulrich
51134cdbfe
digikam5: Fix build after kde merge. 2017-02-22 16:44:08 +01:00
Vladimír Čunát
35b2159671
Merge branch 'master' into staging
Over 11k rebuilds on master.
2017-02-15 08:41:35 +01:00
Thomas Tuegel
c5c4380205 Merge pull request #21366 from sh01/digikam_patch_lensfun_0.3.2
digikam: Add patch to fix compilation against Lensfun 0.3.2
2017-02-14 13:00:27 -06:00
Frederik Rietdijk
5de48cc3ed kde4.digikam: mark as broken 2017-02-13 13:57:54 +01:00
Moritz Ulrich
827009adb2
digikam5: 5.3.0 -> 5.4.0 2017-02-08 15:41:33 +01:00
Sebastian Hagen
4efd108e60 digikam: Add patch to fix compilation against Lensfun 0.3.2 2016-12-23 04:27:52 +00:00
Vladimír Čunát
a11ad092d6
digikam: remove file unintentionally resurrected
... in 8b565d647.  Git's rename semantics is a real PITA.
https://github.com/NixOS/nixpkgs/commit/8b565d647#commitcomment-20099695
2016-12-07 13:25:18 +01:00
Vladimír Čunát
8b565d6478
Merge #20081: update alsa lib, plugins and utils 2016-11-17 11:26:00 +01:00
Moritz Ulrich
bf570a494a
digikam5: 5.1.0 -> 5.3.0 2016-11-15 11:12:45 +01:00
Moritz Ulrich
a115cd5dbf digikam5: Add tools for panorama/stacking to PATH 2016-09-18 17:29:27 +02:00
Moritz Ulrich
bbd82656bb digikam5: Init at 5.1.0 2016-09-09 11:39:59 +02:00
Tuomas Tynkkynen
9d5ba6ba68 treewide: Make explicit that 'dev' output of libusb1 is used 2016-05-19 10:00:47 +02:00
Thomas Tuegel
b4ff81ffd6 phonon-backend-vlc: init at 0.9.0 2016-04-22 08:11:10 -05:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Raymond Gauthier
d2c8919a16 digikam: improvements
-  Now usable in non kde desktop environments.

    Build a immutable sycoca database and use
    wrappers to tie programs to this
    database and avoid interference from the
    outside by specifying a fixed `KDELIBS`
    and fixed/empty `XDG_DATA_DIRS`.

    Added missing dependencies to syscoca
    database so that the program is complete.

    Added all build time optional packages.

    Kipi-plugins now properly detected. Added
    almost all optional dependencies so that
    almost all plugins are usable.

    Now with vlc phonon backend for video playback.

    Now with ffmpeg thumbnailer for video items
    thumbnail creation.

    Now run without any error log.

Tests:

 -  Ran most features of the standard program. Everything
    work perfectly without error logs.
 -  Ran some of the kipi plugins. Work fine there too.
 -  Ran face detection and fingerprint generation
    successfully.
 -  Oxygen icons are now displayed properly.
 -  Ran other wrapped executable successfully.
2016-03-05 22:55:35 -05:00
Tuomas Tynkkynen
69498299dd treewide: Mass replace 'libusb1}/lib' to refer the 'out' output 2016-01-24 10:03:36 +02:00
Thomas Tuegel
2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Cillian de Róiste
e67a0119e2 kde4.digikam: update from 4.11.0 to 4.12.0 2015-08-30 17:38:03 +02:00
Lancelot SIX
bb823e900a kde4.digikam: 4.10.0 -> 4.11.0 2015-07-22 09:28:58 +00:00
Fabian Schmitthenner
86cfcabfbb digikam: enable face recognition 2015-05-18 10:07:56 +00:00
Fabian Schmitthenner
b2dc40401b updated digikam to version 4.10.0 2015-05-17 18:06:49 +00:00
William A. Kennington III
1adb482638 Convert more applications to libmysql 2015-04-22 16:09:41 -07:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Cillian de Róiste
849df05f6c digiKam: tidy up, and add myself to the maintainers 2015-03-15 14:56:09 +01:00
Cillian de Róiste
a2c488e6c0 digiKam: fix gphoto camera support 2015-03-15 14:56:09 +01:00
Lluís Batlle i Rossell
205e338a83 Updating digikam to 4.6.0 and adding libpgf.
4.6.0 fixes the build with current gcc/glibc, and libpgf was a new requirement.

(cherry picked from commit 91b63783e1cd28801c69c4c28a0e320de0500787)
2015-01-23 10:30:16 +01:00
Cillian de Róiste
86fd3ad7a4 kde4.digikam: update from 3.5.0 to 4.4.0, potentially fixes CVE-2012-4514 2014-11-18 21:32:58 +01:00
Nixpkgs Monitor
b92620f680 kde4.digikam: update from 3.2.0 to 3.5.0, potentially fixes CVE-2012-4514, CVE-2012-4514 2013-12-15 23:32:32 +02:00
Lluís Batlle i Rossell
94d83c8953 digikam 3.2: fixing url 2013-05-30 18:46:30 +02:00
Lluís Batlle i Rossell
71229f8eb9 digikam: updating (2.9 for kde 4.7/8, 3.2 for kde 4.10) 2013-05-30 15:13:53 +02:00
Lluís Batlle i Rossell
4d682cc112 digikam: enable parallel building 2013-05-29 21:50:02 +02:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Lluís Batlle i Rossell
7de1a6a074 Updating digikam to 2.6.0. It builds.
svn path=/nixpkgs/trunk/; revision=34564
2012-06-19 17:42:08 +00:00
Lluís Batlle i Rossell
fb12a6838f I remove clapack, and an unused reference I found.
Now liblapack provides a c interface too.


svn path=/nixpkgs/trunk/; revision=32466
2012-02-21 22:16:33 +00:00
Yury G. Kudryashov
185a3d13aa digikam-2.5.0
svn path=/nixpkgs/trunk/; revision=31715
2012-01-19 20:28:13 +00:00
Yury G. Kudryashov
8deba0e4f8 Revert digikam change
svn path=/nixpkgs/trunk/; revision=31714
2012-01-19 20:28:09 +00:00
Yury G. Kudryashov
d38c5e7ee4 KTorrent 4.1.3, fix build with KDE 4.8
svn path=/nixpkgs/trunk/; revision=31713
2012-01-19 20:28:05 +00:00
Lluís Batlle i Rossell
94a638d119 Updating digikam.
Now at least digikam now passes the configure stage. I've still not finished building it though.


svn path=/nixpkgs/trunk/; revision=31080
2011-12-25 22:54:32 +00:00