Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 65138 Details for
Bug 101393
GPE Palmtop Environment: eclass and ebuilds (New Package)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix-makefiles.patch for gpe-lights
fix-makefiles.patch (text/plain), 11.12 KB, created by
Rene Wagner
on 2005-08-04 17:35:58 UTC
(
hide
)
Description:
fix-makefiles.patch for gpe-lights
Filename:
MIME Type:
Creator:
Rene Wagner
Created:
2005-08-04 17:35:58 UTC
Size:
11.12 KB
patch
obsolete
>diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg gpe-lights-0.12/build/Makefile.dpkg_ipkg >--- ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.dpkg_ipkg 1970-01-01 01:00:00.000000000 +0100 >+++ gpe-lights-0.12/build/Makefile.dpkg_ipkg 2004-09-18 20:09:37.000000000 +0100 >@@ -0,0 +1,114 @@ >+## Please read the README in this directory to see how to use this >+## Makefile snippet >+ >+# Let's use whatever clean target the specific app provides >+ >+CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` >+ >+# URL to source tarball >+SOURCE = ftp://gpe.handhelds.org/gpe/source/$(PACKAGE)-$(VERSION).tar.gz >+ >+# can change this to e.g. /var/tmp/deb >+DEB_PATH = ../deb >+ >+ifeq ($(CVSBUILD),yes) >+LIBGPEWIDGET_PC = libgpewidget-uninstalled >+PC_EXTRA=PKG_CONFIG_PATH=../../base/libgpewidget >+else >+LIBGPEWIDGET_PC = libgpewidget >+endif >+ >+ifeq ($(IN_LIBGPEWIDGET),) >+GPECFLAGS = $(shell $(PC_EXTRA) pkg-config --cflags $(LIBGPEWIDGET_PC)) >+GPELIBS = $(shell $(PC_EXTRA) pkg-config --libs $(LIBGPEWIDGET_PC)) >+endif >+ >+GTKCFLAGS = $(shell pkg-config --cflags gtk+-2.0) >+GTKLIBS = $(shell pkg-config --libs gtk+-2.0) >+ >+STANDARD_CPPFLAGS = -D_GNU_SOURCE -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" >+STANDARD_CFLAGS = -MD -Wall >+ >+ifeq ($(DEBUG),yes) >+CFLAGS += -O2 -g >+LDFLAGS = -g >+else >+CFLAGS += -Os -fomit-frame-pointer >+endif >+ >+dist: check-source clean dist-prep >+ rm -rf ../$(PACKAGE)-$(VERSION) >+ mkdir ../$(PACKAGE)-$(VERSION) >+ ( tar cf - --exclude "*/CVS" --exclude CVS --exclude "*~" --exclude "#*#" --exclude "debian" --exclude ".*" --exclude "*.ipk" --exclude "*.ipk.*" --exclude "*.mo" --exclude "*.batch" --exclude "translation-ipkgs.txt" * ) | (cd ../$(PACKAGE)-$(VERSION); tar xf -) >+ ( cd ../$(PACKAGE)-$(VERSION); mkdir build; cp $(BUILD)/Makefile.dpkg_ipkg $(BUILD)/Makefile.translation build/ ; sed 's:^CVSBUILD.*:CVSBUILD = no:' < Makefile > Makefile.new; mv Makefile.new Makefile ) >+ ( cd .. ; tar cf - $(PACKAGE)-$(VERSION) | gzip -9 >$(PACKAGE)-$(VERSION).tar.gz ) >+ rm -rf ../$(PACKAGE)-$(VERSION) >+ $(MAKE) printinfo >+ >+dist-upload: dist >+ scp ../$(PACKAGE)-$(VERSION).tar.gz $(USER)@handhelds.org:/home/ftp/pub/projects/gpe/source/ >+ >+dist-prep: >+ipkg-prep: >+install-mo: >+# empty, can be filled in Makefile.translation >+ >+install: install-program install-mo >+ >+clean-dist: >+ rm -rf familiar/dist familiar/dist.list >+ >+clean: clean-dist >+ >+check-source: >+ @if [ -e familiar ] && ! grep -q '^Source:' familiar/$(CONTROL); then echo -e "\nNo Source: field in control file. Aborting.\n"; exit 1; fi >+ >+ipkg: check-source ipkg-prep clean >+ rm -rf familiar/dist >+ mkdir -p familiar/dist/CONTROL >+ sed 's:VERSION:$(VERSION):;s$$SOURCE$$$(SOURCE)$$' < familiar/$(CONTROL) > familiar/dist/CONTROL/control >+ if test -e familiar/conffiles; then install -m 644 familiar/conffiles familiar/dist/CONTROL; fi >+ if test -e familiar/preinst; then install familiar/preinst familiar/dist/CONTROL; fi >+ if test -e familiar/postinst; then install familiar/postinst familiar/dist/CONTROL; fi >+ if test -e familiar/prerm; then install familiar/prerm familiar/dist/CONTROL; fi >+ if test -e familiar/postrm; then install familiar/postrm familiar/dist/CONTROL; fi >+ $(MAKE) DESTDIR=`pwd`/familiar/dist PREFIX=/usr prefix=/usr DEBUG=no install-program >+ rm -rf familiar/dist.list >+ ipkg-build -o 0 -g 0 familiar/dist | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> familiar/dist.list >+ if [ "x$(LINGUAS)" != "x" ]; then make translation-ipkg; tr ' ' '\n' < translation-ipkgs.txt >> familiar/dist.list; fi >+ md5sum `cat familiar/dist.list` > $(PACKAGE)_$(VERSION).batch >+ rm -rf familiar/dist familiar/dist.list >+ $(MAKE) printinfo >+ >+dpkg: dist >+ mkdir -p $(DEB_PATH) >+ ( olddir=`pwd`; cd $(DEB_PATH); rm -rf $(PACKAGE)-$(VERSION); ln -s $$olddir/../$(PACKAGE)-$(VERSION).tar.gz $(PACKAGE)_$(VERSION).orig.tar.gz ; tar xzf $(PACKAGE)_$(VERSION).orig.tar.gz ) >+ mkdir -p $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian >+ for i in debian/*; do if test -f $$i; then cp $$i $(DEB_PATH)/$(PACKAGE)-$(VERSION)/debian/; fi; done >+ >+CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) >+printinfo: >+ @printf '-------------------------------------------------------------------------------\n' >+ @printf "If this becomes a package release, please add a CVS tag.\n" >+ @printf "You can use 'make tag' for that, it will execute\n" >+ @printf " cvs tag %s\n" $(CVSTAG) >+ @printf "Please upload a tarball (created with 'make dist') to\n" >+ @printf " ftp://ftp.handhelds.org/pub/projects/gpe/\n" >+ @printf " (handhelds.org:~ftp/pub/projects/gpe/source)\n" >+ @printf "You can use 'make dist-upload' to do that.\n" >+ @printf "You are currently known as USER %s.\n" $(USER) >+ @printf '-------------------------------------------------------------------------------\n' >+ >+tag: check-source >+ cvs tag $(CVSTAG) >+ >+retag: check-source >+ cvs tag -F $(CVSTAG) >+ >+source: tag dist-upload >+ >+%.pc: %.pc.in >+ sed 's:PREFIX:$(PREFIX):;s:BUILDDIR:$(shell pwd):;s:VERSION:$(VERSION):' < $< > $@ >+ >+.c.o:; >+ $(CC) $(CFLAGS) $(CPPFLAGS) $(PACKAGE_CFLAGS) $(PACKAGE_CPPFLAGS) -c $< -o $@ >diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation gpe-lights-0.12/build/Makefile.translation >--- ../gpe-lights-0.12-r0/gpe-lights-0.12/build/Makefile.translation 1970-01-01 01:00:00.000000000 +0100 >+++ gpe-lights-0.12/build/Makefile.translation 2004-09-18 20:09:37.000000000 +0100 >@@ -0,0 +1,103 @@ >+.SUFFIXES: .mo .po .pot .po8 >+ >+CONTROL = `if test -e familiar/control1; then echo control1; else echo control; fi` >+ >+# use ipkg-build or ipkg-deb-build >+IPKG_BUILD := ipkg-build >+ >+TRANSLATION_SITE := http://www.iro.umontreal.ca/~gnutra/maint >+ >+ifeq ($(DIR_PO),) >+DIR_PO := po >+endif >+ >+ifeq ($(BINPACKAGE),) >+BINPACKAGE := $(PACKAGE) >+endif >+ >+mo-files = $(patsubst %,$(DIR_PO)/%.mo,$(LINGUAS)) >+po-files = $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) >+ >+ifeq ($(shell if [ -f $(PACKAGE).desktop.in ]; then echo present; fi;),present) >+desktop-files += $(PACKAGE).desktop >+endif >+ >+ifneq ($(EXTRA_DESKTOPS),) >+desktop-files += $(patsubst %.desktop.in,%.desktop,$(EXTRA_DESKTOPS)) >+endif >+ >+all-mo: $(mo-files) >+ >+all-desktop: $(desktop-files) >+ >+install-mo: all-mo >+ if [ "x$(LINGUAS)" != "x" ]; then \ >+ for i in $(LINGUAS); do mkdir -p $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES; install -m 644 $(DIR_PO)/$$i.mo $(DESTDIR)$(PREFIX)/share/locale/$$i/LC_MESSAGES/$(PACKAGE).mo; done \ >+ fi; >+ >+.po8.mo:; >+ msgfmt -o $@ $< >+ >+.po.po8:; >+ CTYPE=`grep "^\"Content-Type:" $< | sed 's/^.*charset=//;s/\\\\.*//'`; sed "s/\(Content-Type: .*=\)$$CTYPE/\1UTF-8/" < $< | iconv -f $${CTYPE} -t UTF-8 >$@ >+ >+update-po: $(po-files) extract-po >+ >+dist-prep: update-po freshen-po >+# empty >+ >+ifeq ($(CVSBUILD),yes) >+ipkg-prep: freshen-po >+# empty >+endif >+ >+extract-po: >+ mkdir -p $(DIR_PO) >+ ( SOURCES="$(SOURCES)"; for DESK in $(PACKAGE).desktop.in $(EXTRA_DESKTOPS); do if [ -f $$DESK ]; then intltool-extract --type=gettext/ini $$DESK; SOURCES="$$SOURCES $${DESK}.h"; fi; done; if [ "x$$SOURCES" != "x" ]; then xgettext --add-comments=TRANSLATORS: -k_ -kN_ -o $(DIR_PO)/$(PACKAGE).pot.new $$SOURCES; fi ) >+ if [ -f $(DIR_PO)/$(PACKAGE).pot.new ]; then if cmp -s $(DIR_PO)/$(PACKAGE).pot.new $(PACKAGE).pot; then rm $(DIR_PO)/$(PACKAGE).pot.new; else mv $(DIR_PO)/$(PACKAGE).pot.new $(DIR_PO)/$(PACKAGE).pot; fi; fi >+ >+clean: clean-po clean-dist-translation >+ >+clean-po: >+ rm -rf $(DIR_PO)/*.mo >+ for i in $(desktop-files); do if [ -f $$i.in ]; then rm -f $$i; rm -f $$i.in.h; fi; done >+ >+%.desktop: %.desktop.in $(patsubst %,$(DIR_PO)/%.po,$(LINGUAS)) >+ intltool-merge -u -d $(DIR_PO) $< $@ >+ >+freshen-po: >+ rm -rf tmp-po >+ mkdir tmp-po >+ cd tmp-po; for LANG in $(LINGUAS); do wget $(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done >+ for LANG in $(LINGUAS); do if [ ! -f $(DIR_PO)/$$LANG.po ] || ! cmp -s $(DIR_PO)/$$LANG.po tmp-po/$$LANG.po ; then mv tmp-po/$$LANG.po $(DIR_PO)/$$LANG.po; echo "Updated $$LANG translation"; fi; done >+ rm -rf tmp-po >+ >+# ------------------------------------------------------------------------ >+ >+MAINTAINER = $(shell grep 'Maintainer: ' familiar/$(CONTROL) | cut -d ' ' -f 2-) >+ >+ifndef BUILD >+BUILD = ../build >+endif >+ >+transdist := familiar/dist-translation >+templates := $(BUILD)/familiar >+ipkglist := translation-ipkgs.txt >+ >+clean-dist-translation: >+ rm -rf $(transdist) $(ipkglist) >+ >+real-translation-package: all-mo >+ rm -rf $(transdist) $(ipkglist) >+ for LINGUA in $(LINGUAS); do \ >+ i=$$(echo $$LINGUA | tr '[A-Z_]' '[a-z+]'); \ >+ mkdir -p $(transdist)/$$i/CONTROL; \ >+ mkdir -p $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES; \ >+ install -m 644 po/$$LINGUA.mo $(transdist)/$$i$(PREFIX)/share/locale/$$LINGUA/LC_MESSAGES/$(PACKAGE).mo; \ >+ sed -e "s/<maintainer>/$(MAINTAINER)/;s/<package>/$(BINPACKAGE)/;s/<version>/$(VERSION)/;s/<language>/$$i/;s!<source>!$(SOURCE)!" $(templates)/control.translation > $(transdist)/$$i/CONTROL/control; \ >+ install $(templates)/postinst.translation $(transdist)/$$i/CONTROL/postinst; \ >+ $(IPKG_BUILD) -g 0 -o 0 $(transdist)/$$i | sed 's/^Packaged .*into //; t 1; d; : 1; s:.*/::' >> $(ipkglist); \ >+ done >+ >+translation-ipkg: >+ make PREFIX=/usr real-translation-package >diff -urNd ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile gpe-lights-0.12/Makefile >--- ../gpe-lights-0.12-r0/gpe-lights-0.12/Makefile 2004-09-17 23:32:53.000000000 +0100 >+++ gpe-lights-0.12/Makefile 2004-09-18 20:10:46.000000000 +0100 >@@ -1,41 +1,37 @@ > PACKAGE = gpe-lights >-PREFIX = /usr/local >+PREFIX = /usr > DEBUG = no > LINGUAS = > VERSION = 0.13 >+DEBUG = no >+CVSBUILD = no > > MEMBERS = gpe-lights > > GTKCFLAGS = `pkg-config --cflags gtk+-2.0` >-GTKLDFLAGS += `pkg-config --libs gtk+-2.0` >+GTKLDFLAGS = `pkg-config --libs gtk+-2.0 gdk-2.0` > >-CPPFLAGS = $(GTKCFLAGS) -D_GNU_SOURCE >-ifeq ($(DEBUG),yes) >-CFLAGS += -O2 -g >-LDFLAGS = -g #-lefence >+PACKAGE_CFLAGS += $(STANDARD_CFLAGS) $(GTKCFLAGS) $(GPECFLAGS) >+PACKAGE_CPPFLAGS += $(STANDARD_CPPFLAGS) -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" >+PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(GTKLDFLAGS) $(GPELIBS) >+ >+ifeq ($(CVSBUILD),yes) >+BUILD = ../build > else >-CFLAGS += -Os -fomit-frame-pointer >+BUILD = build > endif >-CFLAGS += -Wall >-CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\" >-CFLAGS += -MD -I../../base/libgpewidget >- >-LDFLAGS += -L../../base/libgpewidget -lgpewidget >- >-.SUFFIXES: .d > > OBJS = $(patsubst %,%.o,$(MEMBERS)) >-DEPS = $(patsubst %,%.d,$(MEMBERS)) > SOURCES = $(patsubst %,%.c,$(MEMBERS)) >+DEPS = $(patsubst %,%.d,$(MEMBERS)) > > all: $(PACKAGE) > > $(PACKAGE): $(OBJS) >- $(CC) -o $@ $^ $(LDFLAGS) $(GTKLDFLAGS) >+ $(CC) -o $@ $^ $(LDFLAGS) $(PACKAGE_LDFLAGS) > > install-program: all >- install -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) >- strip $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) >+ install -s -D $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) > install -d $(DESTDIR)$(PREFIX)/share/pixmaps > install -d $(DESTDIR)$(PREFIX)/share/applications > install -m 644 $(PACKAGE).png $(DESTDIR)$(PREFIX)/share/pixmaps/ >@@ -49,5 +45,6 @@ > clean: > rm -f $(PACKAGE) $(OBJS) $(DEPS) > >-include ../../base/build/Makefile.dpkg_ipkg >+include $(BUILD)/Makefile.dpkg_ipkg >+include $(BUILD)/Makefile.translation > -include $(DEPS)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 101393
:
65105
|
65106
|
65107
|
65108
|
65109
|
65110
|
65111
|
65112
|
65113
|
65114
|
65115
|
65116
|
65117
|
65118
|
65120
|
65121
|
65122
|
65123
|
65124
|
65125
|
65126
|
65127
|
65128
|
65129
|
65131
|
65132
|
65133
|
65134
|
65135
|
65136
|
65137
| 65138 |
65139
|
65140
|
65141
|
65142
|
65143
|
65144
|
65165
|
65166
|
94038