Archives
Archives
| From: | "Markos Chandras (hwoarang)" <hwoarang@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in x11-misc/xrmap/files: xrmap-2.33-as-needed.patch xrmap-2.33-Makefile.kit.patch |
| Date: | Fri, 28 May 2010 21:10:07 |
| Message-Id: | 20100528211004.4AC772CF39@corvid.gentoo.org |
| 1 | hwoarang 10/05/28 21:10:04 |
| 2 | |
| 3 | Added: xrmap-2.33-as-needed.patch |
| 4 | xrmap-2.33-Makefile.kit.patch |
| 5 | Log: |
| 6 | Version bump. Fixes bug #309661 |
| 7 | (Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 x11-misc/xrmap/files/xrmap-2.33-as-needed.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: xrmap-2.33-as-needed.patch |
| 16 | =================================================================== |
| 17 | Index: xrmap-2.33/Makefile.noimake |
| 18 | =================================================================== |
| 19 | --- xrmap-2.33.orig/Makefile.noimake |
| 20 | +++ xrmap-2.33/Makefile.noimake |
| 21 | @@ -20,7 +20,7 @@ LDOPTIONS=-O6 -g -Wall -lXpm -lX11 -ljp |
| 22 | ## LDOPTIONS=-O6 -g -Wall libxpm/libXpm.a -lX11 -lz -lm -L/usr/X11R6/lib |
| 23 | |
| 24 | all: explorer.o image.o xrmap.o |
| 25 | - gcc $(LDOPTIONS) -o xrmap explorer.o image.o xrmap.o |
| 26 | + gcc -o xrmap explorer.o image.o xrmap.o $(LDOPTIONS) |
| 27 | cd editkit ; make -f Makefile.kit DESTDIR=$(DESTDIR) |
| 28 | cd earthview ; make DESTDIR=$(DESTDIR) |
| 29 | @cat EXTRADATA |
| 30 | |
| 31 | |
| 32 | |
| 33 | 1.1 x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch |
| 34 | |
| 35 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch?rev=1.1&view=markup |
| 36 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch?rev=1.1&content-type=text/plain |
| 37 | |
| 38 | Index: xrmap-2.33-Makefile.kit.patch |
| 39 | =================================================================== |
| 40 | Index: xrmap-2.33/editkit/Makefile.kit |
| 41 | =================================================================== |
| 42 | --- xrmap-2.33.orig/editkit/Makefile.kit |
| 43 | +++ xrmap-2.33/editkit/Makefile.kit |
| 44 | @@ -15,13 +15,14 @@ |
| 45 | |
| 46 | SHAREDIR=/usr/share/editkit |
| 47 | |
| 48 | -CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" |
| 49 | +CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -DSHAREDIR="\"$(SHARE_DIR)\"" |
| 50 | |
| 51 | #CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL |
| 52 | |
| 53 | #CFLAGS = -g -pipe |
| 54 | |
| 55 | TLIBS = -L/usr/lib -ltermcap |
| 56 | +TLIBS = -L/usr/lib -lcurses |
| 57 | XLIBS = -L/usr/X11R6/lib -lX11 |
| 58 | |
| 59 | # Use this for solaris |