diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-09-29 19:38:56 +0200 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-09-29 19:39:35 +0200 |
| commit | bee638d269649ed3d15da728318a48cfd95cb001 (patch) | |
| tree | fd017514cd5cb19e6cd6b4c59d159b0d63c09360 /pkgs | |
| parent | ad135c658d400c2476736226a57968ddc09c977b (diff) | |
| download | nixlib-bee638d269649ed3d15da728318a48cfd95cb001.tar nixlib-bee638d269649ed3d15da728318a48cfd95cb001.tar.gz nixlib-bee638d269649ed3d15da728318a48cfd95cb001.tar.bz2 nixlib-bee638d269649ed3d15da728318a48cfd95cb001.tar.lz nixlib-bee638d269649ed3d15da728318a48cfd95cb001.tar.xz nixlib-bee638d269649ed3d15da728318a48cfd95cb001.tar.zst nixlib-bee638d269649ed3d15da728318a48cfd95cb001.zip | |
icewm: update from 1.3.7 to 1.3.8 and removed obsolete patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/window-managers/icewm/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/icewm/deprecated.patch | 23 |
2 files changed, 2 insertions, 27 deletions
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 3b1c3b4ad37a..f3d88c55c589 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -2,7 +2,7 @@ , fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "icewm-1.3.7"; + name = "icewm-1.3.8"; buildInputs = [ gettext libjpeg libtiff libungif libpng @@ -13,11 +13,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/icewm/${name}.tar.gz"; - sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na"; + sha256 = "066d1mw0vm9ygxnyxksfi6k4vzclvnlkvj04pj3kbcmv1fg8sn0p"; }; - patches = [ ./deprecated.patch ]; - NIX_LDFLAGS = "-lfontconfig"; # The fuloong2f is not supported by 1.3.6 still diff --git a/pkgs/applications/window-managers/icewm/deprecated.patch b/pkgs/applications/window-managers/icewm/deprecated.patch deleted file mode 100644 index 7d22dfe719bd..000000000000 --- a/pkgs/applications/window-managers/icewm/deprecated.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-wm/icewm/files/icewm-1.2.37-libX11-1.5.0-deprecated.patch?revision=1.1 - -Description: Don't use "deprecated" as identifier, will FTBFS if another - library defines functions as deprecated. -Author: Andreas Moog <amoog@ubuntu.com> -Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179 -Forwarded: Yes - ---- icewm-1.3.7.orig/src/base.h -+++ icewm-1.3.7/src/base.h -@@ -2,9 +2,9 @@ - #define __BASE_H - - #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3 --#define deprecated __attribute__((deprecated)) -+#define ICEWM_deprecated __attribute__((deprecated)) - #else --#define deprecated -+#define ICEWM_deprecated - #endif - - /*** Atomar Data Types ********************************************************/ |