| 1 |
jlec 10/03/31 20:43:32 |
| 2 |
|
| 3 |
Modified: 2.7.5-bundled-lib.patch |
| 4 |
Log: |
| 5 |
Removed unneeded patch for ldflags, removed unneeded linking against libforms, #312369 |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: 2.7.5-bundled-lib.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/rasmol/files/2.7.5-bundled-lib.patch,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- 2.7.5-bundled-lib.patch 7 Mar 2010 12:32:53 -0000 1.2 |
| 22 |
+++ 2.7.5-bundled-lib.patch 31 Mar 2010 20:43:32 -0000 1.3 |
| 23 |
@@ -1,6 +1,17 @@ |
| 24 |
---- Imakefile 2009-07-20 16:08:43.000000000 +0200 |
| 25 |
-+++ Imakefile.new 2009-07-25 14:07:08.000000000 +0200 |
| 26 |
-@@ -276,17 +276,10 @@ |
| 27 |
+diff --git a/src/Imakefile b/src/Imakefile |
| 28 |
+index 03be00e..a0c68f9 100755 |
| 29 |
+--- a/src/Imakefile |
| 30 |
++++ b/src/Imakefile |
| 31 |
+@@ -176,7 +176,7 @@ XFORMSLIB_DIR = /usr/local |
| 32 |
+ #endif |
| 33 |
+ endif |
| 34 |
+ XFORMSLIB_INCLUDE_DIR = $(XFORMSLIB_DIR)/include |
| 35 |
+-XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_DIR)/lib -lforms |
| 36 |
++XFORMSLIB_LDLIB = -lXpm -L$(XFORMSLIB_DIR)/lib |
| 37 |
+ #endif |
| 38 |
+ #endif |
| 39 |
+ #endif |
| 40 |
+@@ -281,17 +281,10 @@ RASMOLDIR = $(USRLIBDIR)/rasmol/ |
| 41 |
|
| 42 |
#ifndef USE_XFORMSLIB |
| 43 |
DEFINES = $(GTKCFLAGS) $(GUIDEF) -DRASMOLDIR=\"$(RASMOLDIR)\" $(DEPTHDEF) $(LOCALEDEF) \ |
| 44 |
@@ -20,7 +31,7 @@ |
| 45 |
#endif |
| 46 |
|
| 47 |
|
| 48 |
-@@ -312,11 +305,11 @@ |
| 49 |
+@@ -317,11 +310,11 @@ OBJS = rasmol.o molecule.o abstree.o cmndline.o command.o transfor.o \ |
| 50 |
# Additional RS6000 AIX MITSHM Library |
| 51 |
# LDLIBS = -lm -lXi -lXextSam $(XLIB) |
| 52 |
|
| 53 |
@@ -29,15 +40,15 @@ |
| 54 |
- $(CQRLIB_LDLIB) \ |
| 55 |
- $(CVECTOR_LDLIB) \ |
| 56 |
- $(NEARTREE_LDLIB) $(XFORMSLIB_LDLIB) |
| 57 |
-+LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) -lforms $(GTKLIBS) \ |
| 58 |
++LDLIBS = -lm -lXi $(XLIB) $(EXTRA_LIBRARIES) $(GTKLIBS) \ |
| 59 |
+ -lcbf \ |
| 60 |
+ -lCQRlib \ |
| 61 |
+ -lCVector \ |
| 62 |
-+ -lCNearTree -lforms -lgfortran |
| 63 |
++ -lCNearTree -lgfortran |
| 64 |
|
| 65 |
|
| 66 |
# |
| 67 |
-@@ -420,11 +413,11 @@ |
| 68 |
+@@ -425,11 +418,11 @@ $(NEARTREE_DIR): |
| 69 |
$(NEARTREE_DIR)/CNearTree.c: $(NEARTREE_DIR) |
| 70 |
#endif |
| 71 |
|
| 72 |
@@ -54,9 +65,11 @@ |
| 73 |
|
| 74 |
|
| 75 |
gtkwin.c: gtkui.h |
| 76 |
---- Makefile.in 2009-07-14 18:39:18.000000000 +0200 |
| 77 |
-+++ Makefile.in.new 2009-07-25 14:08:11.000000000 +0200 |
| 78 |
-@@ -165,7 +165,7 @@ |
| 79 |
+diff --git a/src/Makefile.in b/src/Makefile.in |
| 80 |
+index fc6d0af..bad90fc 100755 |
| 81 |
+--- a/src/Makefile.in |
| 82 |
++++ b/src/Makefile.in |
| 83 |
+@@ -165,7 +165,7 @@ $(CBFLIBDIR)/lib/libcbf.a: $(CBFLIBDIR) |
| 84 |
|
| 85 |
all: postdownload rasmol rastxt |
Archives