icewm: update from 1.3.7 to 1.3.8 and removed obsolete patch
This commit is contained in:
parent
ad135c658d
commit
bee638d269
@ -2,7 +2,7 @@
|
|||||||
, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }:
|
, fontconfig, xlibs, automake, pkgconfig, gdk_pixbuf }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "icewm-1.3.7";
|
name = "icewm-1.3.8";
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ gettext libjpeg libtiff libungif libpng
|
[ gettext libjpeg libtiff libungif libpng
|
||||||
@ -13,11 +13,9 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/icewm/${name}.tar.gz";
|
url = "mirror://sourceforge/icewm/${name}.tar.gz";
|
||||||
sha256 = "0yw813d8amrl0n1fvdiyznxah92wcylj9kj1qhjc6h73d827h6na";
|
sha256 = "066d1mw0vm9ygxnyxksfi6k4vzclvnlkvj04pj3kbcmv1fg8sn0p";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./deprecated.patch ];
|
|
||||||
|
|
||||||
NIX_LDFLAGS = "-lfontconfig";
|
NIX_LDFLAGS = "-lfontconfig";
|
||||||
|
|
||||||
# The fuloong2f is not supported by 1.3.6 still
|
# The fuloong2f is not supported by 1.3.6 still
|
||||||
|
@ -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 ********************************************************/
|
|
Loading…
Reference in New Issue
Block a user