diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2010-05-28 21:10:04 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2010-05-28 21:10:04 +0000 |
| commit | 6127084c1f9eb4ee6c1e48c91de8f11ac7808f16 (patch) | |
| tree | c3e5ce2c5bcbd9ebf404f9aae820a704b82d3c3f /x11-misc/xrmap/files | |
| parent | Use Python 2 (bug #313951). (diff) | |
| download | gentoo-2-6127084c1f9eb4ee6c1e48c91de8f11ac7808f16.tar.gz gentoo-2-6127084c1f9eb4ee6c1e48c91de8f11ac7808f16.tar.bz2 gentoo-2-6127084c1f9eb4ee6c1e48c91de8f11ac7808f16.zip | |
Version bump. Fixes bug #309661
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xrmap/files')
| -rw-r--r-- | x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch | 20 | ||||
| -rw-r--r-- | x11-misc/xrmap/files/xrmap-2.33-as-needed.patch | 13 |
2 files changed, 33 insertions, 0 deletions
diff --git a/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch b/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch new file mode 100644 index 000000000000..9cf26c7551cb --- /dev/null +++ b/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch @@ -0,0 +1,20 @@ +Index: xrmap-2.33/editkit/Makefile.kit +=================================================================== +--- xrmap-2.33.orig/editkit/Makefile.kit ++++ xrmap-2.33/editkit/Makefile.kit +@@ -15,13 +15,14 @@ + + SHAREDIR=/usr/share/editkit + +-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" ++CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -DSHAREDIR="\"$(SHARE_DIR)\"" + + #CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL + + #CFLAGS = -g -pipe + + TLIBS = -L/usr/lib -ltermcap ++TLIBS = -L/usr/lib -lcurses + XLIBS = -L/usr/X11R6/lib -lX11 + + # Use this for solaris diff --git a/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch b/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch new file mode 100644 index 000000000000..82f29f5e3e8a --- /dev/null +++ b/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch @@ -0,0 +1,13 @@ +Index: xrmap-2.33/Makefile.noimake +=================================================================== +--- xrmap-2.33.orig/Makefile.noimake ++++ xrmap-2.33/Makefile.noimake +@@ -20,7 +20,7 @@ LDOPTIONS=-O6 -g -Wall -lXpm -lX11 -ljp + ## LDOPTIONS=-O6 -g -Wall libxpm/libXpm.a -lX11 -lz -lm -L/usr/X11R6/lib + + all: explorer.o image.o xrmap.o +- gcc $(LDOPTIONS) -o xrmap explorer.o image.o xrmap.o ++ gcc -o xrmap explorer.o image.o xrmap.o $(LDOPTIONS) + cd editkit ; make -f Makefile.kit DESTDIR=$(DESTDIR) + cd earthview ; make DESTDIR=$(DESTDIR) + @cat EXTRADATA |