Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-visualization/gle/files: gle-4.2.2-parallel.patch gle-4.2.2-ncurses.patch
Date: Thu, 07 Jan 2010 17:38:11
Message-Id: E1NSwJB-0008DY-VZ@stork.gentoo.org
1 bicatali 10/01/07 17:38:05
2
3 Added: gle-4.2.2-parallel.patch gle-4.2.2-ncurses.patch
4 Log:
5 Version bump. Introduced patch to build in parallel and a fix to properly include the manip ncurses tools
6 (Portage version: 2.2_rc61/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sci-visualization/gle/files/gle-4.2.2-parallel.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gle/files/gle-4.2.2-parallel.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gle/files/gle-4.2.2-parallel.patch?rev=1.1&content-type=text/plain
13
14 Index: gle-4.2.2-parallel.patch
15 ===================================================================
16 --- src/gui/MakefileAC.in.orig 2010-01-06 20:10:04.000000000 +0000
17 +++ src/gui/MakefileAC.in 2010-01-06 20:21:15.000000000 +0000
18 @@ -84,14 +84,14 @@
19 qmake:
20 $(QMAKE_PROG) $(QMAKE_OPTS)
21
22 -domake:
23 - $(MAKE_PROG)
24 +domake: Makefile
25 + $(MAKE)
26
27 -repmake:
28 +repmake: Makefile
29 perl ../../platform/autopackage/qt-replace.pl Makefile
30
31 doclean:
32 - -$(MAKE_PROG) clean
33 + -$(MAKE) clean
34 -@$(RM) qgle install_qgle_name_mac Makefile
35 -@$(RMDIR) moc
36 -@$(RMDIR) objects
37
38
39
40 1.1 sci-visualization/gle/files/gle-4.2.2-ncurses.patch
41
42 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gle/files/gle-4.2.2-ncurses.patch?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/gle/files/gle-4.2.2-ncurses.patch?rev=1.1&content-type=text/plain
44
45 Index: gle-4.2.2-ncurses.patch
46 ===================================================================
47 --- configure.ac.orig 2010-01-07 04:37:57.000000000 +0000
48 +++ configure.ac 2010-01-07 04:42:01.000000000 +0000
49 @@ -621,12 +621,12 @@
50 LIBS=$SIMPLE_LIBS
51 LDFLAGS=$SIMPLE_LDFLAGS
52
53 - AC_SEARCH_LIBS(wbkgdset,ncurses curses,
54 + AC_SEARCH_LIBS(wbkgdset,ncurses,
55 [
56 MAKE_MANIP=1
57 ],
58 - [],[-ltinfo])
59 - AC_SEARCH_LIBS(keypad,tinfo,[],[],[])
60 + [],[-lncurses])
61 + AC_SEARCH_LIBS(keypad,ncurses,[],[],[])
62 AC_CHECK_HEADER([ncurses.h],
63 [
64 HAVE_NCURSES_H=1
65 @@ -649,7 +649,7 @@
66 MANIP_LIBS=$LIBS
67 MANIP_LDFLAGS=$LDFLAGS
68 if test "x$with_staticlink" = "xyes"; then
69 - MANIP_LIBS="$SIMPLE_LIBS -Wl,-Bstatic -lncurses -ltinfo -lm -Wl,-Bdynamic -ldl"
70 + MANIP_LIBS="$SIMPLE_LIBS -Wl,-Bstatic -lncurses -lm -Wl,-Bdynamic -ldl"
71 #MANIP_LIBS="$SIMPLE_LIBS -Wl,-Bstatic -lncurses -lm -Wl,-Bdynamic -ldl"
72 else
73 MANIP_LIBS="$MANIP_LIBS -lm"