Add 'nixpkgs/' from commit 'abf060725d7614bd3b9f96764262dfbc2f9c2199'

git-subtree-dir: nixpkgs
git-subtree-mainline: 4e31070265257dc67d120c27e0f75c2344fdfa9a
git-subtree-split: abf060725d7614bd3b9f96764262dfbc2f9c2199

4 files changed, 89 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch b/nixpkgs/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch
new file mode 100644
index 000000000000..84b62dcd4eb0
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/motif/Add-X.Org-to-bindings-file.patch
@@ -0,0 +1,7 @@
+--- a/bindings/xmbind.alias
++++ b/bindings/xmbind.alias
+@@ -62,3 +62,4 @@
+ "Sun Microsystems, Inc."				sun
+ ! "Sun Microsystems, Inc."				sun_at
+ "Tektronix, Inc."					tek
++"The X.Org Foundation"				tpc
diff --git a/nixpkgs/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch b/nixpkgs/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch
new file mode 100644
index 000000000000..801310ba41ce
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/motif/Remove-unsupported-weak-refs-on-darwin.patch
@@ -0,0 +1,12 @@
+--- a/lib/Xm/XmP.h
++++ b/lib/Xm/XmP.h
+@@ -1437,7 +1437,7 @@ extern void _XmDestroyParentCallback(
+ 
+ #endif /* NO_XM_1_2_BC */
+ 
+-#if __GNUC__
++#if __GNUC__ && ! __APPLE__
+ #  define XM_DEPRECATED  __attribute__((__deprecated__))
+ #  define XM_ALIAS(sym)  __attribute__((__weak__,alias(#sym)))
+ #else
+
diff --git a/nixpkgs/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch b/nixpkgs/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch
new file mode 100644
index 000000000000..d91e43ba2d3c
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/motif/Use-correct-header-for-malloc.patch
@@ -0,0 +1,19 @@
+--- a/demos/programs/workspace/xrmLib.c
++++ b/demos/programs/workspace/xrmLib.c
+@@ -30,7 +30,14 @@ static char rcsid[] = "$XConsortium: xrmLib.c /main/6 1995/07/14 10:01:41 drk $"
+ #endif
+ 
+ #include <stdio.h>
+-#include <malloc.h>
++#if defined(__cplusplus) || defined(__STDC__) || defined(__EXTENSIONS__)
++#  include <stdlib.h>
++#  if defined(HAVE_MALLOC_H)
++#  include <malloc.h>
++#  elif defined(HAVE_SYS_MALLOC_H)
++#  include <sys/malloc.h>
++#  endif
++#endif
+ #include <Xm/Xm.h>
+ #include "wsm.h"
+ #include "wsmDebug.h"
+
diff --git a/nixpkgs/pkgs/development/libraries/motif/default.nix b/nixpkgs/pkgs/development/libraries/motif/default.nix
new file mode 100644
index 000000000000..c57353ccbd47
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/motif/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, pkgconfig, libtool
+, xlibsWrapper, xbitmaps, libXrender, libXmu, libXt
+, expat, libjpeg, libpng, libiconv
+, flex
+, libXp, libXau
+, demoSupport ? false
+}:
+# refer to the gentoo package
+
+stdenv.mkDerivation rec {
+  name = "motif-${version}";
+  version = "2.3.6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/motif/${name}.tar.gz";
+    sha256 = "1ksqbp0bzdw6wcrx8s4hj4ivvxmw54hz85l2xfigb87cxmmhx0gs";
+  };
+
+  buildInputs = [
+    libtool
+    xlibsWrapper xbitmaps libXrender libXmu libXt
+    expat libjpeg libpng libiconv
+  ];
+
+  nativeBuildInputs = [ pkgconfig flex ];
+
+  propagatedBuildInputs = [ libXp libXau ];
+
+  hardeningDisable = [ "format" ];
+
+  makeFlags = [ "CFLAGS=-fno-strict-aliasing" ];
+
+  prePatch = ''
+    rm lib/Xm/Xm.h
+  '' + stdenv.lib.optionalString (!demoSupport) ''
+    sed '/^SUBDIRS =,^$/s/\<demos\>//' -i Makefile.{am,in}
+  '';
+
+  patches = [ ./Remove-unsupported-weak-refs-on-darwin.patch
+              ./Use-correct-header-for-malloc.patch
+              ./Add-X.Org-to-bindings-file.patch
+            ];
+
+  meta = with stdenv.lib; {
+    homepage = http://motif.ics.com;
+    description = "Unix standard widget-toolkit and window-manager";
+    platforms = with platforms; linux ++ darwin;
+    license = with licenses; [ lgpl21 ];
+    maintainers = with maintainers; [ ];
+  };
+}