| 1 |
xarthisius 10/05/28 06:42:43 |
| 2 |
|
| 3 |
Added: galaxy-1.8-gentoo.patch |
| 4 |
Log: |
| 5 |
New ebuild for galaxy. Ebuild written by Juan Pablo Lassala. Fixes bug 321719 |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-astronomy/galaxy/files/galaxy-1.8-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/galaxy/files/galaxy-1.8-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-astronomy/galaxy/files/galaxy-1.8-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: galaxy-1.8-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
--- desktop |
| 17 |
+++ desktop |
| 18 |
@@ -3,7 +3,7 @@ |
| 19 |
Categories=Game |
| 20 |
Type=Application |
| 21 |
Terminal=false |
| 22 |
-Exec=/usr/local/bin/galaxy |
| 23 |
-Icon=/usr/local/share/galaxy/icons/galaxy.png |
| 24 |
+Exec=/usr/bin/galaxy |
| 25 |
+Icon=/usr/share/galaxy/icons/galaxy.png |
| 26 |
GenericName=Stellar Simulation |
| 27 |
Comment=Stars steered by gravity, galaxy evolution |
| 28 |
--- Makefile |
| 29 |
+++ Makefile |
| 30 |
@@ -8,38 +8,39 @@ |
| 31 |
# replace -O3 with -g for GDB debugging |
| 32 |
CXXFLAGS ?= -O3 -Wall |
| 33 |
LDFLAGS ?= -O3 -Wall -rdynamic |
| 34 |
-PREFIX ?= /usr/local |
| 35 |
+PREFIX = /usr |
| 36 |
|
| 37 |
-CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-2.0` |
| 38 |
-LFLAGS = $(LDFLAGS) `pkg-config --libs gtk+-2.0 gthread-2.0` |
| 39 |
+GTK_CFLAGS = `pkg-config --cflags gtk+-2.0` |
| 40 |
+GTK_LIBS = `pkg-config --libs gtk+-2.0 gthread-2.0` |
| 41 |
|
| 42 |
BINDIR = $(PREFIX)/bin |
| 43 |
DATADIR = $(PREFIX)/share/$(PROGRAM) |
| 44 |
ICONDIR = $(DATADIR)/icons |
| 45 |
-DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop |
| 46 |
-DOCDIR = $(PREFIX)/share/doc/$(PROGRAM) |
| 47 |
+DESKDIR = $(PREFIX)/share/applications |
| 48 |
+DESKTOP = $(DESKDIR)/$(PROGRAM).desktop |
| 49 |
+DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)-$(VERSION) |
| 50 |
|
| 51 |
$(PROGRAM): $(PROGRAM).o zfuncs.o |
| 52 |
- $(CXX) $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o |
| 53 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o $(GTK_LIBS) |
| 54 |
|
| 55 |
$(PROGRAM).o: $(SOURCE) |
| 56 |
- $(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ |
| 57 |
+ $(CXX) $(CXXFLAGS) $(GTK_CFLAGS) -o $(PROGRAM).o -c $(SOURCE) \ |
| 58 |
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" |
| 59 |
|
| 60 |
zfuncs.o: zfuncs.cc |
| 61 |
- $(CXX) $(CFLAGS) zfuncs.cc \ |
| 62 |
+ $(CXX) $(CXXFLAGS) $(GTK_CFLAGS) -c zfuncs.cc \ |
| 63 |
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" |
| 64 |
|
| 65 |
install: $(PROGRAM) |
| 66 |
mkdir -p $(DESTDIR)$(DOCDIR) |
| 67 |
mkdir -p $(DESTDIR)$(BINDIR) |
| 68 |
- mkdir -p $(DESTDIR)$(DATADIR) |
| 69 |
mkdir -p $(DESTDIR)$(ICONDIR) |
| 70 |
- cp -R doc/* $(DESTDIR)$(DOCDIR) |
| 71 |
+ mkdir -p $(DESTDIR)$(DESKDIR) |
| 72 |
+ cp -R doc/{images,userguide-en.html} $(DESTDIR)$(DOCDIR) |
| 73 |
cp -R data/* $(DESTDIR)$(DATADIR) |
| 74 |
cp icons/* $(DESTDIR)$(ICONDIR) |
| 75 |
+ cp -f desktop $(DESTDIR)$(DESKTOP) |
| 76 |
cp $(PROGRAM) $(DESTDIR)$(BINDIR) |
| 77 |
- @ echo use make menu to install desktop menu |
| 78 |
|
| 79 |
menu: |
| 80 |
cp -f desktop $(DESKTOP) |
Archives