JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xaw3d: 1.5E -> 1.6.2, switch md5 to sha256, use X.org as the upstream

Browse Source
This commit is contained in:
Michael Raskin 2016-10-26 15:48:39 +02:00
parent ef9eeb8a2c
commit 5f4ab83015
4 changed files with 7 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/libraries/Xaw3d/builder.sh
View File

@ -1,24 +0,0 @@
source $stdenv/setup
configurePhase() {
cd lib/Xaw3d
(mkdir X11 && cd X11 && ln -fs .. Xaw3d)
xmkmf
}
buildPhase() {
make depend $makeFlags
make $makeFlags
}
installPhase() {
make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include
cd $out/include/X11 && ln -s Xaw3d Xaw
mkdir -p "$out/nix-support"
echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
}
makeFlags="CDEBUGFLAGS=" # !!! awful hack
genericBuild

51
pkgs/development/libraries/Xaw3d/config.patch
View File

@ -1,51 +0,0 @@
diff -rc xc-orig/lib/Xaw3d/Imakefile xc/lib/Xaw3d/Imakefile
*** xc-orig/lib/Xaw3d/Imakefile 2003-03-08 15:55:18.000000000 +0100
--- xc/lib/Xaw3d/Imakefile 2005-11-11 20:12:24.000000000 +0100
***************
*** 9,15 ****
XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
#define GRAY_BLKWHT_STIPPLES
XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
! #undef ARROW_SCROLLBARS
#define DoNormalLib NormalLibXaw
#define DoSharedLib SharedLibXaw
--- 9,15 ----
XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
#define GRAY_BLKWHT_STIPPLES
XCOMM For scrollbars with arrows, define ARROW_SCROLLBARS:
! #define ARROW_SCROLLBARS
#define DoNormalLib NormalLibXaw
#define DoSharedLib SharedLibXaw
***************
*** 22,28 ****
#define IncSubSubdir Xaw3d
XCOMM When building outside an X11 source tree:
! XCOMM EXTRA_INCLUDES = -I.
#ifdef SharedXawReqs
REQUIREDLIBS = SharedXawReqs
--- 22,28 ----
#define IncSubSubdir Xaw3d
XCOMM When building outside an X11 source tree:
! EXTRA_INCLUDES = -I.
#ifdef SharedXawReqs
REQUIREDLIBS = SharedXawReqs
diff -rc xc-orig/lib/Xaw3d/laylex.l xc/lib/Xaw3d/laylex.l
*** xc-orig/lib/Xaw3d/laylex.l 1996-10-15 16:41:26.000000000 +0200
--- xc/lib/Xaw3d/laylex.l 2005-11-11 20:03:50.000000000 +0100
***************
*** 26,31 ****
--- 26,33 ----
#ifdef __STDC__
static int count ();
#endif
+
+ static int LayYY_prev_more_offset = 0;
%}
%%
vertical return VERTICAL;

14
pkgs/development/libraries/Xaw3d/default.nix
View File

@ -1,14 +1,14 @@
{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex}:
{stdenv, fetchurl, xlibsWrapper, imake, gccmakedep, libXmu, libXpm, libXp, bison, flex, pkgconfig}:
stdenv.mkDerivation {
name = "Xaw3d-1.5E";
builder = ./builder.sh;
name = "Xaw3d-1.6.2";
src = fetchurl {
url = http://freshmeat.net/redir/xaw3d/11835/url_tgz/Xaw3d-1.5E.tar.gz;
md5 = "29ecfdcd6bcf47f62ecfd672d31269a1";
urls = [
ftp://ftp.x.org/pub/xorg/individual/lib/libXaw3d-1.6.tar.bz2
];
sha256 = "099kx6ni5vkgr3kf40glif8m6r1m1hq6hxqlqrblaj1w5cphh8hi";
};
patches = [./config.patch ./laylex.patch];
buildInputs = [imake gccmakedep libXpm libXp bison flex];
buildInputs = [imake gccmakedep libXpm libXp bison flex pkgconfig];
propagatedBuildInputs = [xlibsWrapper libXmu];
meta = {

13
pkgs/development/libraries/Xaw3d/laylex.patch
View File

@ -1,13 +0,0 @@
diff -rc xc-orig/lib/Xaw3d/laylex.l xc/lib/Xaw3d/laylex.l
*** xc-orig/lib/Xaw3d/laylex.l 2006-08-07 12:12:54.000000000 +0200
--- xc/lib/Xaw3d/laylex.l 2006-08-07 12:14:49.000000000 +0200
***************
*** 27,33 ****
static int count ();
#endif
- static int LayYY_prev_more_offset = 0;
%}
%%
vertical return VERTICAL;
--- 27,32 ----