1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
From 9c9317713139d65507375f0869e832b2100e7310 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <ametzler@bebt.de>
Date: Sat, 11 Jun 2016 18:55:01 +0200
Subject: [PATCH] Stop using intltool.
---
Makefile.am | 21 +++++++++++++--------
configure.ac | 13 +++++++------
gtkam.desktop.in | 4 ++--
3 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index ebf39b7..856ae1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,21 +18,26 @@ gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO CHANGES
icondir = $(datadir)/pixmaps
icon_DATA = gtkam.png
-# This fixes broken INTLTOOL_DESKTOP_RULE@ (original lacks \n\t)
-%.desktop: %.desktop.in
- $(INTLTOOL_MERGE) $(top_srcdir)/po/*.po
- $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
-
DESKTOP_IN_FILES=gtkam.desktop.in
DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
+gtkam.desktop: gtkam.desktop.in
+ tmpfiles="t-$@ n-t-$@"; \
+ pofiles=`MAKEFLAGS= $(MAKE) -s -C $(top_builddir)/po print-pofiles`; \
+ cp $< t-$@ || exit 1; \
+ for pofile in $$pofiles; do \
+ $(MSGFMT) --desktop --template t-$@ -o n-t-$@ \
+ --locale $${pofile%.po} $(top_builddir)/po/$$pofile \
+ || { rm -f $$tmpfiles; exit 1; }; \
+ mv n-t-$@ t-$@ || { rm -f $$tmpfiles; exit 1; } \
+ done; \
+ mv t-$@ $@ || { rm -f $$tmpfiles; exit 1; }
+
+
Applicationsdir = $(datadir)/applications
Applications_DATA = $(DESKTOP_FILES)
EXTRA_DIST = gtkam.png ChangeLog AUTHORS COPYING NEWS README TODO CHANGES \
- intltool-extract.in \
- intltool-merge.in \
- intltool-update.in \
$(DESKTOP_IN_FILES) \
$(DESKTOP_FILES)
diff --git a/configure.ac b/configure.ac
index 3ae6890..2150821 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,6 @@ AM_PROG_LIBTOOL
AC_PROG_INSTALL
AM_PROG_CC_C_O
GP_PKG_CONFIG
-IT_PROG_INTLTOOL
LT_INIT
AC_SUBST(POMAKEFILEDEPS)
@@ -51,7 +50,7 @@ dnl i18n support
dnl ---------------------------------------------------------------------------
GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}])
ALL_LINGUAS="be cs da de eo es fi fr hu id it is ja nb nl pa pl pt_BR pt ru sk sl sr sv uk vi zh_CN"
-AM_GNU_GETTEXT_VERSION([0.14.1])
+AM_GNU_GETTEXT_VERSION([0.19.7])
AM_GNU_GETTEXT([external])
AM_ICONV()
GP_GETTEXT_FLAGS()
@@ -237,7 +236,6 @@ AC_SUBST([AM_LDFLAGS])
# Output files
# ---------------------------------------------------------------------------
AC_CONFIG_FILES([
-po/Makefile.in
gphoto-m4/Makefile
Makefile
art/Makefile
@@ -253,9 +251,12 @@ omf-install/gtkam-C.omf
help/Makefile
help/C/Makefile
help/ru/Makefile
-intltool-extract
-intltool-merge
-intltool-update
+])
+AC_CONFIG_FILES([po/Makefile.in], [
+cat >> po/Makefile.in <<'EOF'
+print-pofiles:
+ @echo $(POFILES)
+EOF
])
AC_OUTPUT()
diff --git a/gtkam.desktop.in b/gtkam.desktop.in
index 1339783..e809ea7 100644
--- a/gtkam.desktop.in
+++ b/gtkam.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
-_Name=Gtkam Digital Camera Browser
-_Comment=Browse and download images from an attached digital camera
+Name=Gtkam Digital Camera Browser
+Comment=Browse and download images from an attached digital camera
Exec=gtkam
Icon=gtkam-camera
Terminal=false
--
2.8.1
|
