OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 17-Sep-2004 11:58:54
Branch: HEAD Handle: 2004091710585300
Modified files:
openpkg-src/magicpoint magicpoint.patch magicpoint.spec
Log:
order is important if linking static libraries
Summary:
Revision Changes Path
1.5 +8 -4 openpkg-src/magicpoint/magicpoint.patch
1.36 +5 -4 openpkg-src/magicpoint/magicpoint.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/magicpoint/magicpoint.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 magicpoint.patch
--- openpkg-src/magicpoint/magicpoint.patch 2 Jul 2003 18:03:33 -0000 1.4
+++ openpkg-src/magicpoint/magicpoint.patch 17 Sep 2004 09:58:53 -0000 1.5
@@ -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);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/magicpoint/magicpoint.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 magicpoint.spec
--- openpkg-src/magicpoint/magicpoint.spec 7 Feb 2004 17:56:31 -0000 1.35
+++ openpkg-src/magicpoint/magicpoint.spec 17 Sep 2004 09:58:53 -0000 1.36
@@ -33,8 +33,8 @@
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 @@
# 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 @@
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
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
