Download as
Browse Code »

Commit e124aa4d0d5b4561bfbabbc28a279d4d6f39d8bf

Authored by Perry Werneck
1 parent 3e3cd23b
Exists in master and in 4 other branches develop, edit-header-bar, keypads, script-support

Fixing windows build.

Showing 4 changed files with 27 additions and 236 deletions   Show diff stats
Makefile.in
  Diff comments   View file @e124aa4
... ... @@ -62,6 +62,7 @@ MSGCAT=@MSGCAT@
62 62 WINDRES=@WINDRES@
63 63 AR=@AR@
64 64 VALGRIND=@VALGRIND@
  65 +CONVERT=@CONVERT@
65 66  
66 67 #---[ Paths ]----------------------------------------------------------------------------
67 68  
... ... @@ -191,11 +192,11 @@ $(POTDIR)/$(PACKAGE_NAME)/%.pot: \
191 192 $<
192 193 @touch $@
193 194  
194   -$(POTDIR)/$(PACKAGE_NAME)/src/%.pot: \
  195 +$(POTDIR)/$(PACKAGE_NAME)/%.pot: \
195 196 %.rc
196 197  
197 198 @echo $< ...
198   - @$(MKDIR) $(dir $@)
  199 + @$(MKDIR) $(@D)
199 200 @touch $@
200 201  
201 202  
... ... @@ -216,13 +217,29 @@ install-%: \
216 217  
217 218 @$(MAKE) -C `dirname $<` DESTDIR=$(DESTDIR) install
218 219  
  220 +%.ico: \
  221 + branding/%.svg
  222 +
  223 + @echo $@ ...
  224 + @$(MKDIR) $(@D)
  225 + @$(CONVERT) \
  226 + -density 384 \
  227 + -background transparent \
  228 + $< \
  229 + -define icon:auto-resize \
  230 + -colors 256 \
  231 + $@
  232 +
  233 +
219 234 #---[ Release Targets ]------------------------------------------------------------------
220 235  
221 236 all: \
  237 + @PACKAGE_TARNAME@.ico \
222 238 $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@ \
223 239 locale/$(PACKAGE_NAME).pot
224 240  
225 241 Release: \
  242 + @PACKAGE_TARNAME@.ico \
226 243 $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@
227 244  
228 245 $(BINRLS)/$(PACKAGE_NAME)@EXEEXT@: \
... ... @@ -276,6 +293,7 @@ locale/$(PACKAGE_NAME).pot: \
276 293 #---[ Debug Targets ]--------------------------------------------------------------------
277 294  
278 295 Debug: \
  296 + @PACKAGE_TARNAME@.ico \
279 297 $(BINDBG)/$(PACKAGE_NAME)@EXEEXT@
280 298  
281 299 $(BINDBG)/$(PACKAGE_NAME)@EXEEXT@: \
... ... @@ -323,6 +341,7 @@ clean: \
323 341 @rm -fr $(BASEDIR)/.tmp/$(PACKAGE_NAME)
324 342 @rm -fr $(POTDIR)/$(PACKAGE_NAME)
325 343 @rm -fr src/include/marshal
  344 + @rm -f @PACKAGE_TARNAME@.ico
326 345  
327 346 cleanDebug:
328 347  
... ...
locale/pw3270.pot
  Diff comments   View file @e124aa4
... ... @@ -6,241 +6,9 @@
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9   -"#-#-#-#-# view.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 9 "Project-Id-Version: PACKAGE VERSION\n"
11 10 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
13   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15   -"Language-Team: LANGUAGE <LL@li.org>\n"
16   -"Language: \n"
17   -"MIME-Version: 1.0\n"
18   -"Content-Type: text/plain; charset=CHARSET\n"
19   -"Content-Transfer-Encoding: 8bit\n"
20   -"#-#-#-#-# simple.pot (PACKAGE VERSION) #-#-#-#-#\n"
21   -"Project-Id-Version: PACKAGE VERSION\n"
22   -"Report-Msgid-Bugs-To: \n"
23   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
24   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
25   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
26   -"Language-Team: LANGUAGE <LL@li.org>\n"
27   -"Language: \n"
28   -"MIME-Version: 1.0\n"
29   -"Content-Type: text/plain; charset=CHARSET\n"
30   -"Content-Transfer-Encoding: 8bit\n"
31   -"#-#-#-#-# save.pot (PACKAGE VERSION) #-#-#-#-#\n"
32   -"Project-Id-Version: PACKAGE VERSION\n"
33   -"Report-Msgid-Bugs-To: \n"
34   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
35   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
36   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
37   -"Language-Team: LANGUAGE <LL@li.org>\n"
38   -"Language: \n"
39   -"MIME-Version: 1.0\n"
40   -"Content-Type: text/plain; charset=CHARSET\n"
41   -"Content-Transfer-Encoding: 8bit\n"
42   -"#-#-#-#-# abstract.pot (PACKAGE VERSION) #-#-#-#-#\n"
43   -"Project-Id-Version: PACKAGE VERSION\n"
44   -"Report-Msgid-Bugs-To: \n"
45   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
46   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
47   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
48   -"Language-Team: LANGUAGE <LL@li.org>\n"
49   -"Language: \n"
50   -"MIME-Version: 1.0\n"
51   -"Content-Type: text/plain; charset=CHARSET\n"
52   -"Content-Transfer-Encoding: 8bit\n"
53   -"#-#-#-#-# application.pot (PACKAGE VERSION) #-#-#-#-#\n"
54   -"Project-Id-Version: PACKAGE VERSION\n"
55   -"Report-Msgid-Bugs-To: \n"
56   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
57   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
58   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
59   -"Language-Team: LANGUAGE <LL@li.org>\n"
60   -"Language: \n"
61   -"MIME-Version: 1.0\n"
62   -"Content-Type: text/plain; charset=CHARSET\n"
63   -"Content-Transfer-Encoding: 8bit\n"
64   -"#-#-#-#-# preferences.pot (PACKAGE VERSION) #-#-#-#-#\n"
65   -"Project-Id-Version: PACKAGE VERSION\n"
66   -"Report-Msgid-Bugs-To: \n"
67   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
68   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
69   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
70   -"Language-Team: LANGUAGE <LL@li.org>\n"
71   -"Language: \n"
72   -"MIME-Version: 1.0\n"
73   -"Content-Type: text/plain; charset=CHARSET\n"
74   -"Content-Transfer-Encoding: 8bit\n"
75   -"#-#-#-#-# open.pot (PACKAGE VERSION) #-#-#-#-#\n"
76   -"Project-Id-Version: PACKAGE VERSION\n"
77   -"Report-Msgid-Bugs-To: \n"
78   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
79   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
80   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
81   -"Language-Team: LANGUAGE <LL@li.org>\n"
82   -"Language: \n"
83   -"MIME-Version: 1.0\n"
84   -"Content-Type: text/plain; charset=CHARSET\n"
85   -"Content-Transfer-Encoding: 8bit\n"
86   -"#-#-#-#-# about.pot (PACKAGE VERSION) #-#-#-#-#\n"
87   -"Project-Id-Version: PACKAGE VERSION\n"
88   -"Report-Msgid-Bugs-To: \n"
89   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
90   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
91   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
92   -"Language-Team: LANGUAGE <LL@li.org>\n"
93   -"Language: \n"
94   -"MIME-Version: 1.0\n"
95   -"Content-Type: text/plain; charset=CHARSET\n"
96   -"Content-Transfer-Encoding: 8bit\n"
97   -"#-#-#-#-# window.pot (PACKAGE VERSION) #-#-#-#-#\n"
98   -"Project-Id-Version: PACKAGE VERSION\n"
99   -"Report-Msgid-Bugs-To: \n"
100   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
101   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
102   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
103   -"Language-Team: LANGUAGE <LL@li.org>\n"
104   -"Language: \n"
105   -"MIME-Version: 1.0\n"
106   -"Content-Type: text/plain; charset=CHARSET\n"
107   -"Content-Transfer-Encoding: 8bit\n"
108   -"#-#-#-#-# terminal.pot (PACKAGE VERSION) #-#-#-#-#\n"
109   -"Project-Id-Version: PACKAGE VERSION\n"
110   -"Report-Msgid-Bugs-To: \n"
111   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
112   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
113   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
114   -"Language-Team: LANGUAGE <LL@li.org>\n"
115   -"Language: \n"
116   -"MIME-Version: 1.0\n"
117   -"Content-Type: text/plain; charset=CHARSET\n"
118   -"Content-Transfer-Encoding: 8bit\n"
119   -"#-#-#-#-# page.pot (PACKAGE VERSION) #-#-#-#-#\n"
120   -"Project-Id-Version: PACKAGE VERSION\n"
121   -"Report-Msgid-Bugs-To: \n"
122   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
123   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
124   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
125   -"Language-Team: LANGUAGE <LL@li.org>\n"
126   -"Language: \n"
127   -"MIME-Version: 1.0\n"
128   -"Content-Type: text/plain; charset=CHARSET\n"
129   -"Content-Transfer-Encoding: 8bit\n"
130   -"#-#-#-#-# setcolors.pot (PACKAGE VERSION) #-#-#-#-#\n"
131   -"Project-Id-Version: PACKAGE VERSION\n"
132   -"Report-Msgid-Bugs-To: \n"
133   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
134   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
135   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
136   -"Language-Team: LANGUAGE <LL@li.org>\n"
137   -"Language: \n"
138   -"MIME-Version: 1.0\n"
139   -"Content-Type: text/plain; charset=CHARSET\n"
140   -"Content-Transfer-Encoding: 8bit\n"
141   -"#-#-#-#-# sessionproperties.pot (PACKAGE VERSION) #-#-#-#-#\n"
142   -"Project-Id-Version: PACKAGE VERSION\n"
143   -"Report-Msgid-Bugs-To: \n"
144   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
145   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
146   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
147   -"Language-Team: LANGUAGE <LL@li.org>\n"
148   -"Language: \n"
149   -"MIME-Version: 1.0\n"
150   -"Content-Type: text/plain; charset=CHARSET\n"
151   -"Content-Transfer-Encoding: 8bit\n"
152   -"#-#-#-#-# hostproperties.pot (PACKAGE VERSION) #-#-#-#-#\n"
153   -"Project-Id-Version: PACKAGE VERSION\n"
154   -"Report-Msgid-Bugs-To: \n"
155   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
156   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
157   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
158   -"Language-Team: LANGUAGE <LL@li.org>\n"
159   -"Language: \n"
160   -"MIME-Version: 1.0\n"
161   -"Content-Type: text/plain; charset=CHARSET\n"
162   -"Content-Transfer-Encoding: 8bit\n"
163   -"#-#-#-#-# filetransfer.pot (PACKAGE VERSION) #-#-#-#-#\n"
164   -"Project-Id-Version: PACKAGE VERSION\n"
165   -"Report-Msgid-Bugs-To: \n"
166   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
167   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
168   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
169   -"Language-Team: LANGUAGE <LL@li.org>\n"
170   -"Language: \n"
171   -"MIME-Version: 1.0\n"
172   -"Content-Type: text/plain; charset=CHARSET\n"
173   -"Content-Transfer-Encoding: 8bit\n"
174   -"#-#-#-#-# connect.pot (PACKAGE VERSION) #-#-#-#-#\n"
175   -"Project-Id-Version: PACKAGE VERSION\n"
176   -"Report-Msgid-Bugs-To: \n"
177   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
178   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
179   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
180   -"Language-Team: LANGUAGE <LL@li.org>\n"
181   -"Language: \n"
182   -"MIME-Version: 1.0\n"
183   -"Content-Type: text/plain; charset=CHARSET\n"
184   -"Content-Transfer-Encoding: 8bit\n"
185   -"#-#-#-#-# close.pot (PACKAGE VERSION) #-#-#-#-#\n"
186   -"Project-Id-Version: PACKAGE VERSION\n"
187   -"Report-Msgid-Bugs-To: \n"
188   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
189   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
190   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
191   -"Language-Team: LANGUAGE <LL@li.org>\n"
192   -"Language: \n"
193   -"MIME-Version: 1.0\n"
194   -"Content-Type: text/plain; charset=CHARSET\n"
195   -"Content-Transfer-Encoding: 8bit\n"
196   -"#-#-#-#-# toolbar.pot (PACKAGE VERSION) #-#-#-#-#\n"
197   -"Project-Id-Version: PACKAGE VERSION\n"
198   -"Report-Msgid-Bugs-To: \n"
199   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
200   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
201   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
202   -"Language-Team: LANGUAGE <LL@li.org>\n"
203   -"Language: \n"
204   -"MIME-Version: 1.0\n"
205   -"Content-Type: text/plain; charset=CHARSET\n"
206   -"Content-Transfer-Encoding: 8bit\n"
207   -"#-#-#-#-# settings.pot (PACKAGE VERSION) #-#-#-#-#\n"
208   -"Project-Id-Version: PACKAGE VERSION\n"
209   -"Report-Msgid-Bugs-To: \n"
210   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
211   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
212   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
213   -"Language-Team: LANGUAGE <LL@li.org>\n"
214   -"Language: \n"
215   -"MIME-Version: 1.0\n"
216   -"Content-Type: text/plain; charset=CHARSET\n"
217   -"Content-Transfer-Encoding: 8bit\n"
218   -"#-#-#-#-# tools.pot (PACKAGE VERSION) #-#-#-#-#\n"
219   -"Project-Id-Version: PACKAGE VERSION\n"
220   -"Report-Msgid-Bugs-To: \n"
221   -"POT-Creation-Date: 2020-01-14 17:12-0300\n"
222   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
223   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
224   -"Language-Team: LANGUAGE <LL@li.org>\n"
225   -"Language: \n"
226   -"MIME-Version: 1.0\n"
227   -"Content-Type: text/plain; charset=CHARSET\n"
228   -"Content-Transfer-Encoding: 8bit\n"
229   -"#-#-#-#-# window.pot (PACKAGE VERSION) #-#-#-#-#\n"
230   -"Project-Id-Version: PACKAGE VERSION\n"
231   -"Report-Msgid-Bugs-To: \n"
232   -"POT-Creation-Date: 2020-01-14 17:23-0300\n"
233   -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
234   -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
235   -"Language-Team: LANGUAGE <LL@li.org>\n"
236   -"Language: \n"
237   -"MIME-Version: 1.0\n"
238   -"Content-Type: text/plain; charset=CHARSET\n"
239   -"Content-Transfer-Encoding: 8bit\n"
240   -"#-#-#-#-# application.pot (PACKAGE VERSION) #-#-#-#-#\n"
241   -"Project-Id-Version: PACKAGE VERSION\n"
242   -"Report-Msgid-Bugs-To: \n"
243   -"POT-Creation-Date: 2020-01-14 17:23-0300\n"
  11 +"POT-Creation-Date: 2020-01-15 13:09-0300\n"
244 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
245 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
246 14 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
src/main/main.c
  Diff comments   View file @e124aa4
... ... @@ -44,6 +44,7 @@
44 44  
45 45 /*---[ Implement ]----------------------------------------------------------------------------------*/
46 46  
  47 +#ifdef G_OS_UNIX
47 48 static gboolean quit_signal(GtkApplication *app) {
48 49  
49 50 debug("%s",__FUNCTION__);
... ... @@ -65,6 +66,7 @@ static gboolean quit_signal(GtkApplication *app) {
65 66 g_application_quit(G_APPLICATION(app));
66 67 return FALSE;
67 68 }
  69 +#endif // G_OS_UNIX
68 70  
69 71 int main (int argc, char **argv) {
70 72  
... ...
src/objects/application/application.c
  Diff comments   View file @e124aa4
... ... @@ -226,7 +226,6 @@
226 226 // Get plugins.
227 227 {
228 228 #ifdef _WIN32
229   - UINT errorMode;
230 229 lib3270_autoptr(char) path = lib3270_build_data_filename("plugins",NULL);
231 230 #else
232 231 const gchar * path = G_STRINGIFY(LIBDIR) G_DIR_SEPARATOR_S G_STRINGIFY(PRODUCT_NAME) "-plugins";
... ... @@ -291,7 +290,10 @@
291 290 pw3270Application * application = PW3270_APPLICATION(object);
292 291  
293 292 if(application->plugins) {
  293 + #pragma GCC diagnostic push
  294 + #pragma GCC diagnostic ignored "-Wcast-function-type"
294 295 g_slist_free_full(application->plugins,(GDestroyNotify) g_module_close);
  296 + #pragma GCC diagnostic pop
295 297 application->plugins = NULL;
296 298 }
297 299  
... ...