瀏覽代碼

order is important if linking static libraries

Thorsten Hohmeier 21 年之前
父節點
當前提交
5565da8c1f
共有 2 個文件被更改,包括 13 次插入8 次删除
  1. 8 4
      magicpoint/magicpoint.patch
  2. 5 4
      magicpoint/magicpoint.spec

+ 8 - 4
magicpoint/magicpoint.patch

@@ -19,14 +19,18 @@
  
  /* SUPPRESS 530 */
  /* SUPPRESS 560 */
---- image/new.c.orig	Mon Dec 28 09:23:13 1998
-+++ image/new.c	Wed Jul  2 20:02:06 2003
-@@ -11,7 +11,7 @@
+Index: image/new.c
+--- image/new.c.orig	2004-09-01 05:50:32 +0200
++++ image/new.c	2004-09-16 11:10:05 +0200
+@@ -11,11 +11,7 @@
  #include "copyright.h"
  #include "image.h"
  
+-#ifdef __APPLE__
+ #include <stdlib.h>
+-#else
 -#include <malloc.h>
-+#include <stdlib.h>
+-#endif
  
  extern int _Xdebug;
  extern void memoryExhausted(void);

+ 5 - 4
magicpoint/magicpoint.spec

@@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Graphics
 License:      GPL
-Version:      1.10a
-Release:      20040207
+Version:      1.11a
+Release:      20040917
 
 #   list of sources
 Source0:      ftp://ftp.mew.org/pub/mgp/magicpoint-%{version}.tar.gz
@@ -45,8 +45,8 @@ Patch0:       magicpoint.patch
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, X11, flex, bison, make, gcc
-PreReq:       OpenPKG, openpkg >= 20040130, X11, perl
+BuildPreReq:  OpenPKG, openpkg >= 20040130, X11, flex, bison, make, gcc, zlib
+PreReq:       OpenPKG, openpkg >= 20040130, X11, perl, zlib
 AutoReq:      no
 AutoReqProv:  no
 
@@ -73,6 +73,7 @@ AutoReqProv:  no
         USAGE
     %{l_shtool} subst \
         -e 's;\$(LIBDIR)/mgp;%{l_prefix}/share/mgp;g' \
+        -e '/^SYS_LIBRARIES=/s;$; -lz;g' \
         Imakefile.in
 
     echo 'ac_cv_path_mgp_cv_path_perl="%{l_prefix}/bin/perl"' >config.cache