[Gpe-list] adding autotools support to GPE apps

D Marlin damarlin at gmail.com
Thu Apr 10 08:20:58 CEST 2008


On Wed, Apr 9, 2008 at 10:52 PM, D Marlin <damarlin at gmail.com> wrote:
> On Wed, Apr 9, 2008 at 5:34 PM, Philippe De Swert
>  <philippedeswert at scarlet.be> wrote:
>  > Hi,
        :
>  >  > Please let me know if this type patch, and patch format, are acceptable.
>  >
>  >  Send it inline in your mail, because I am afraid attachments will be dismissed
>  >  by the mailing list.
>
>  I'll try it again, possibly using a different email client.
>
        :

Since that didn't seem to work, I'll try again with copy/paste the
patch into the email body in the gmail web client.


d.marlin
---------------------------------------

diff -Nru base/gpe-calculator/autogen.sh base/gpe-calculator/autogen.sh
--- base/gpe-calculator/autogen.sh 1969-12-31 18:00:00.000000000 -0600
+++ base/gpe-calculator/autogen.sh 2008-03-19 01:47:17.000000000 -0500
@@ -0,0 +1,4 @@
+intltoolize --copy --automake --force
+
+autoreconf -f -i -s
+
diff -Nru base/gpe-calculator/configure.ac base/gpe-calculator/configure.ac
--- base/gpe-calculator/configure.ac 1969-12-31 18:00:00.000000000 -0600
+++ base/gpe-calculator/configure.ac 2008-03-19 01:47:17.000000000 -0500
@@ -0,0 +1,40 @@
+dnl Process this file with autoconf to produce a configure script.
+dnl gpe-calculator-0.7
+
+AC_PREREQ(2.59)
+AC_INIT(gpe-calculator,0.7,gpe-list at linuxtogo.org)
+AC_CONFIG_SRCDIR([main.c])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+
+AC_PROG_CC
+AC_STDC_HEADERS
+AC_PROG_INSTALL
+
+
+DEP_MODULES="gtk+-2.0 >= 2.2 glib-2.0 >= 2.2 libgpewidget"
+
+# i8n stuff
+AH_TEMPLATE([GETTEXT_PACKAGE], [Package name for gettext])
+GETTEXT_PACKAGE=$PACKAGE
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
+AC_SUBST(GETTEXT_PACKAGE)
+ALL_LINGUAS=""
+
+gpecalculator_localedir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(gpecalculator_localedir)
+
+AM_GLIB_GNU_GETTEXT
+AC_PROG_INTLTOOL([0.23])
+
+
+PKG_CHECK_MODULES(DEPS, $DEP_MODULES)
+
+
+AC_SUBST(DEPS_CFLAGS)
+AC_SUBST(DEPS_LIBS)
+
+AC_OUTPUT([
+Makefile
+po/Makefile.in
+gpe-calculator.desktop.in
+])
diff -Nru base/gpe-calculator/gpe-calculator.desktop.in.in
base/gpe-calculator/gpe-calculator.desktop.in.in
--- base/gpe-calculator/gpe-calculator.desktop.in.in 1969-12-31
18:00:00.000000000 -0600
+++ base/gpe-calculator/gpe-calculator.desktop.in.in 2008-03-19
01:47:17.000000000 -0500
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Calculator
+_Comment=GPE Calculator
+Exec=gpe-calculator
+Terminal=false
+Type=Application
+Icon=gpe-calculator.png
+Categories=Application;Utility;GPE;
+StartupNotify=true
diff -Nru base/gpe-calculator/gpe-dist.am base/gpe-calculator/gpe-dist.am
--- base/gpe-calculator/gpe-dist.am 1969-12-31 18:00:00.000000000 -0600
+++ base/gpe-calculator/gpe-dist.am 2008-03-19 01:47:17.000000000 -0500
@@ -0,0 +1,12 @@
+CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_])
+
+dist-upload: dist
+ scp $(PACKAGE)-$(VERSION).tar.bz2
$(USER)@linuxtogo.org:/media/data/projects/gpe/source/
+
+tag:
+ cvs tag $(CVSTAG)
+
+retag:
+ cvs tag -F $(CVSTAG)
+
+source: tag dist-upload
diff -Nru base/gpe-calculator/gpe-tp.am base/gpe-calculator/gpe-tp.am
--- base/gpe-calculator/gpe-tp.am 1969-12-31 18:00:00.000000000 -0600
+++ base/gpe-calculator/gpe-tp.am 2008-03-19 01:47:18.000000000 -0500
@@ -0,0 +1,24 @@
+DIR_PO = po
+DIR_TP = tp
+
+#-- Fetch .po files from TP
+freshen-po: linguas
+ rm -rf tmp-po
+ mkdir tmp-po
+# cd tmp-po; for LANG in $(LINGUAS); do wget
$(TRANSLATION_SITE)/$(PACKAGE)/$$LANG.po; done
+ cd tmp-po; ../$(DIR_TP)/po-wget-last ../$(DIR_TP)/postats $(PACKAGE)
+ for LANG in $$(cat 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
+
+#-- Extract LINGUAS from TP stat file
+linguas: $(DIR_TP)/postats
+ $(DIR_TP)/po-extract-linguas $(DIR_TP)/postats $(PACKAGE) > linguas
+ @echo "linguas:::: " $(LINGUAS)
+
+#-- Fetch TP stat file
+$(DIR_TP)/postats: freshen-postats
+freshen-postats:
+ @echo "++++++++++++++++++++++++++++++++++++++"
+ @echo "Freshen "$(DIR_TP)"/postats:"
+ cd $(DIR_TP) && wget --timestamping
http://www.iro.umontreal.ca/translation/data/postats
+ @echo "++++++++++++++++++++++++++++++++++++++"
diff -Nru base/gpe-calculator/Makefile.am base/gpe-calculator/Makefile.am
--- base/gpe-calculator/Makefile.am 1969-12-31 18:00:00.000000000 -0600
+++ base/gpe-calculator/Makefile.am 2008-03-19 01:47:18.000000000 -0500
@@ -0,0 +1,53 @@
+
+SUBDIRS = po
+
+INCLUDES = $(DEPS_CFLAGS) -I$(top_srcdir) \
+   -DPREFIX=\"@prefix@\" -D_GNU_SOURCE \
+   -DPACKAGE_LOCALE_DIR=\"@gpecalculator_localedir@\" \
+   -DPACKAGE_DATA_DIR=\"$(datadir)\"
+
+bin_PROGRAMS = gpe-calculator
+
+gpe_calculator_LDADD = @DEPS_LIBS@
+
+gpe_calculator_SOURCES = main.c \
+ calc_basic.c callbacks.c display.c general_functions.c \
+ interface.c math_functions.c support.c \
+ calc_basic.h callbacks.h display.h galculator.h general_functions.h \
+ interface.h math_functions.h support.h
+
+desktopdir = $(datadir)/applications
+desktop_in_files = gpe-calculator.desktop.in
+
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
+
+pixmapsdir = $(datadir)/pixmaps
+pixmaps_DATA = gpe-calculator.png
+
+EXTRA_DIST = $(desktop_DATA) \
+             $(pixmaps_DATA) \
+             intltool-extract.in \
+             intltool-merge.in \
+             intltool-update.in
+
+
+DISTCLEANFILES = intltool-extract \
+                 intltool-merge \
+                 intltool-update
+
+clean-local:
+ rm -f gpe-calculator.desktop
+ rm -f po/.intltool-merge-cache
+ rm -rf autom4te.cache
+ rm -f *.d *~
+
+deb: dist
+ -mkdir $(top_builddir)/debian-build
+ cd $(top_builddir)/debian-build && tar xzf
$(top_builddir)/../$(PACKAGE)-$(VERSION).tar.gz
+ cp -r $(top_builddir)/debian
$(top_builddir)/debian-build/$(PACKAGE)-$(VERSION)
+ cd $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION) &&
dpkg-buildpackage -rfakeroot
+ -rm -rf $(top_builddir)/debian-build/$(PACKAGE)-$(VERSION)
+
+include gpe-dist.am
+include gpe-tp.am
diff -Nru base/gpe-calculator/po/gpe-calculator.pot
base/gpe-calculator/po/gpe-calculator.pot
--- base/gpe-calculator/po/gpe-calculator.pot 1969-12-31
18:00:00.000000000 -0600
+++ base/gpe-calculator/po/gpe-calculator.pot 2008-03-19
01:47:18.000000000 -0500
@@ -0,0 +1,186 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-02-19 12:42-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: interface.c:85
+msgid "layout galculator"
+msgstr ""
+
+#: interface.c:116
+msgid "1/x"
+msgstr ""
+
+#: interface.c:127
+msgid "x^2"
+msgstr ""
+
+#: interface.c:138
+msgid "SQRT"
+msgstr ""
+
+#: interface.c:149
+msgid "C"
+msgstr ""
+
+#: interface.c:164
+msgid "AC"
+msgstr ""
+
+#: interface.c:179
+msgid "INV"
+msgstr ""
+
+#: interface.c:190
+msgid "HYP"
+msgstr ""
+
+#: interface.c:201
+msgid "sin"
+msgstr ""
+
+#: interface.c:212
+msgid "cos"
+msgstr ""
+
+#: interface.c:223
+msgid "tan"
+msgstr ""
+
+#: interface.c:235
+msgid "e"
+msgstr ""
+
+#: interface.c:246
+msgid "EE"
+msgstr ""
+
+#: interface.c:257
+msgid "log"
+msgstr ""
+
+#: interface.c:268
+msgid "ln"
+msgstr ""
+
+#: interface.c:279
+msgid "x^y"
+msgstr ""
+
+#: interface.c:294
+msgid "PI"
+msgstr ""
+
+#: interface.c:305
+msgid "n!"
+msgstr ""
+
+#: interface.c:316
+msgid "("
+msgstr ""
+
+#: interface.c:330
+msgid ")"
+msgstr ""
+
+#: interface.c:344
+msgid "/"
+msgstr ""
+
+#: interface.c:362
+msgid "MS"
+msgstr ""
+
+#: interface.c:373
+msgid "7"
+msgstr ""
+
+#: interface.c:390
+msgid "8"
+msgstr ""
+
+#: interface.c:407
+msgid "9"
+msgstr ""
+
+#: interface.c:424
+msgid "*"
+msgstr ""
+
+#: interface.c:442
+msgid "MR"
+msgstr ""
+
+#: interface.c:453
+msgid "4"
+msgstr ""
+
+#: interface.c:470
+msgid "5"
+msgstr ""
+
+#: interface.c:487
+msgid "6"
+msgstr ""
+
+#: interface.c:504
+msgid "-"
+msgstr ""
+
+#: interface.c:522
+msgid "M+"
+msgstr ""
+
+#: interface.c:533
+msgid "1"
+msgstr ""
+
+#: interface.c:549
+msgid "2"
+msgstr ""
+
+#: interface.c:566
+msgid "3"
+msgstr ""
+
+#: interface.c:583
+msgid "+"
+msgstr ""
+
+#: interface.c:601
+msgid "<-"
+msgstr ""
+
+#: interface.c:615
+msgid "0"
+msgstr ""
+
+#: interface.c:632
+msgid "."
+msgstr ""
+
+#: interface.c:652
+msgid "+/-"
+msgstr ""
+
+#: interface.c:663
+msgid "="
+msgstr ""
+
+#: support.c:90 support.c:114
+#, c-format
+msgid "Couldn't find pixmap file: %s"
+msgstr ""
diff -Nru base/gpe-calculator/po/POTFILES.in base/gpe-calculator/po/POTFILES.in
--- base/gpe-calculator/po/POTFILES.in 1969-12-31 18:00:00.000000000 -0600
+++ base/gpe-calculator/po/POTFILES.in 2008-03-19 01:47:18.000000000 -0500
@@ -0,0 +1,17 @@
+gpe-calculator.desktop.in.in
+main.c
+calc_basic.c
+callbacks.c
+display.c
+general_functions.c
+interface.c
+math_functions.c
+support.c
+calc_basic.h
+callbacks.h
+display.h
+galculator.h
+general_functions.h
+interface.h
+math_functions.h
+support.h



More information about the Gpe-list mailing list