Download as
Browse Code »

Commit 5c8b3bdb04e642f31ed04b00171defd7217f2115

Authored by perry.werneck@gmail.com
1 parent 791a767f
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Corrigindo alteração indevida no Makefile do plugin rexx, removendo trace no makefile do plugin dbus

Showing 3 changed files with 44 additions and 22 deletions   Show diff stats
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2014-04-16 08:48-0300\n" 8 +"POT-Creation-Date: 2014-04-23 09:34-0300\n"
9 "PO-Revision-Date: 2014-02-17 08:05-0300\n" 9 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Portugues <>\n" 11 "Language-Team: Portugues <>\n"
@@ -20,7 +20,7 @@ msgstr &quot;&quot; @@ -20,7 +20,7 @@ msgstr &quot;&quot;
20 "X-Generator: Gtranslator 2.91.6\n" 20 "X-Generator: Gtranslator 2.91.6\n"
21 21
22 #: telnet.c:1055 ssl.c:261 ssl.c:314 connect.c:98 connect.c:114 connect.c:116 22 #: telnet.c:1055 ssl.c:261 ssl.c:314 connect.c:98 connect.c:114 connect.c:116
23 -#: connect.c:572 connect.c:589 23 +#: connect.c:570 connect.c:587
24 #, c-format 24 #, c-format
25 msgid "%s" 25 msgid "%s"
26 msgstr "%s" 26 msgstr "%s"
@@ -364,7 +364,7 @@ msgstr &quot;Tema de c_ores:&quot; @@ -364,7 +364,7 @@ msgstr &quot;Tema de c_ores:&quot;
364 msgid "C_onnect" 364 msgid "C_onnect"
365 msgstr "_Conectar" 365 msgstr "_Conectar"
366 366
367 -#: toggles.c:313 connect.c:364 connect.c:459 367 +#: toggles.c:313 connect.c:362 connect.c:457
368 #, c-format 368 #, c-format
369 msgid "Can't %s network keep-alive" 369 msgid "Can't %s network keep-alive"
370 msgstr "Não foi possível %s opção \"keep-alive\"" 370 msgstr "Não foi possível %s opção \"keep-alive\""
@@ -374,12 +374,12 @@ msgstr &quot;Não foi possível %s opção \&quot;keep-alive\&quot;&quot; @@ -374,12 +374,12 @@ msgstr &quot;Não foi possível %s opção \&quot;keep-alive\&quot;&quot;
374 msgid "Can't accept unnamed %s" 374 msgid "Can't accept unnamed %s"
375 msgstr "Não posso aceitar elemento %s sem nome" 375 msgstr "Não posso aceitar elemento %s sem nome"
376 376
377 -#: connect.c:106 connect.c:395 377 +#: connect.c:106 connect.c:393
378 #, c-format 378 #, c-format
379 msgid "Can't connect to %s" 379 msgid "Can't connect to %s"
380 msgstr "Não foi possível conectar a %s" 380 msgstr "Não foi possível conectar a %s"
381 381
382 -#: connect.c:276 connect.c:429 382 +#: connect.c:274 connect.c:427
383 #, c-format 383 #, c-format
384 msgid "Can't connect to %s:%s" 384 msgid "Can't connect to %s:%s"
385 msgstr "Não foi possível conectar a %s:%s" 385 msgstr "Não foi possível conectar a %s:%s"
@@ -481,11 +481,11 @@ msgstr &quot;Não foi possível definir o charset do host&quot; @@ -481,11 +481,11 @@ msgstr &quot;Não foi possível definir o charset do host&quot;
481 msgid "Can't set lib3270 I/O handlers" 481 msgid "Can't set lib3270 I/O handlers"
482 msgstr "Não foi possível registrar manipuladores de I/O 3270" 482 msgstr "Não foi possível registrar manipuladores de I/O 3270"
483 483
484 -#: connect.c:588 484 +#: connect.c:586
485 msgid "Can't set socket to blocking mode." 485 msgid "Can't set socket to blocking mode."
486 msgstr "Não foi possível mudar o socket para o modo blocante." 486 msgstr "Não foi possível mudar o socket para o modo blocante."
487 487
488 -#: connect.c:588 488 +#: connect.c:586
489 msgid "Can't set socket to non blocking mode" 489 msgid "Can't set socket to non blocking mode"
490 msgstr "Não foi possível setar o socket para o modo não blocante." 490 msgstr "Não foi possível setar o socket para o modo não blocante."
491 491
@@ -608,9 +608,9 @@ msgstr &quot;Configurar host&quot; @@ -608,9 +608,9 @@ msgstr &quot;Configurar host&quot;
608 msgid "Connect on startup" 608 msgid "Connect on startup"
609 msgstr "Conectar ao iniciar" 609 msgstr "Conectar ao iniciar"
610 610
611 -#: connect.c:199 connect.c:297 connect.c:306 connect.c:368 connect.c:383  
612 -#: connect.c:399 connect.c:413 connect.c:433 connect.c:447 connect.c:463  
613 -#: connect.c:557 611 +#: connect.c:199 connect.c:295 connect.c:304 connect.c:366 connect.c:381
  612 +#: connect.c:397 connect.c:411 connect.c:431 connect.c:445 connect.c:461
  613 +#: connect.c:555
614 msgid "Connection error" 614 msgid "Connection error"
615 msgstr "Erro de conexão" 615 msgstr "Erro de conexão"
616 616
@@ -1486,7 +1486,7 @@ msgstr &quot;Erro SSL&quot; @@ -1486,7 +1486,7 @@ msgstr &quot;Erro SSL&quot;
1486 msgid "SSL Read error" 1486 msgid "SSL Read error"
1487 msgstr "Erro de leitura SSL" 1487 msgstr "Erro de leitura SSL"
1488 1488
1489 -#: connect.c:334 1489 +#: connect.c:332
1490 msgid "SSL error" 1490 msgid "SSL error"
1491 msgstr "Erro SSL" 1491 msgstr "Erro SSL"
1492 1492
@@ -1683,7 +1683,7 @@ msgstr &quot;Show timer when processing&quot; @@ -1683,7 +1683,7 @@ msgstr &quot;Show timer when processing&quot;
1683 msgid "Smart paste" 1683 msgid "Smart paste"
1684 msgstr "Colar inteligente" 1684 msgstr "Colar inteligente"
1685 1685
1686 -#: connect.c:570 connect.c:587 1686 +#: connect.c:568 connect.c:585
1687 msgid "Socket error" 1687 msgid "Socket error"
1688 msgstr "Erro no socket" 1688 msgstr "Erro no socket"
1689 1689
@@ -2003,7 +2003,7 @@ msgstr &quot;&quot; @@ -2003,7 +2003,7 @@ msgstr &quot;&quot;
2003 msgid "This program requires GTK version %d.%d.%d" 2003 msgid "This program requires GTK version %d.%d.%d"
2004 msgstr "Este programa precisa do GTK versão %d.%d.%d" 2004 msgstr "Este programa precisa do GTK versão %d.%d.%d"
2005 2005
2006 -#: connect.c:336 2006 +#: connect.c:334
2007 #, c-format 2007 #, c-format
2008 msgid "" 2008 msgid ""
2009 "This version of %s was built without support for secure sockets layer (SSL)." 2009 "This version of %s was built without support for secure sockets layer (SSL)."
@@ -2085,7 +2085,7 @@ msgstr &quot;UTF-8&quot; @@ -2085,7 +2085,7 @@ msgstr &quot;UTF-8&quot;
2085 msgid "Uknown DFT Open type from host" 2085 msgid "Uknown DFT Open type from host"
2086 msgstr "Host enviou código de abertura DFT desconhecido" 2086 msgstr "Host enviou código de abertura DFT desconhecido"
2087 2087
2088 -#: connect.c:335 2088 +#: connect.c:333
2089 msgid "Unable to connect to secure hosts" 2089 msgid "Unable to connect to secure hosts"
2090 msgstr "Não é possível conectar em servidores seguros" 2090 msgstr "Não é possível conectar em servidores seguros"
2091 2091
@@ -2463,23 +2463,23 @@ msgstr &quot;um atributo \&quot;action\&quot;&quot; @@ -2463,23 +2463,23 @@ msgstr &quot;um atributo \&quot;action\&quot;&quot;
2463 msgid "bracket" 2463 msgid "bracket"
2464 msgstr "bracket" 2464 msgstr "bracket"
2465 2465
2466 -#: toggles.c:313 connect.c:364 connect.c:459 2466 +#: toggles.c:313 connect.c:362 connect.c:457
2467 msgid "disable" 2467 msgid "disable"
2468 msgstr "desabilitar" 2468 msgstr "desabilitar"
2469 2469
2470 -#: toggles.c:313 connect.c:364 connect.c:459 2470 +#: toggles.c:313 connect.c:362 connect.c:457
2471 msgid "enable" 2471 msgid "enable"
2472 msgstr "enable" 2472 msgstr "enable"
2473 2473
2474 -#: connect.c:571 2474 +#: connect.c:569
2475 msgid "fcntl() error when getting socket state." 2475 msgid "fcntl() error when getting socket state."
2476 msgstr "fcntl() error when getting socket state." 2476 msgstr "fcntl() error when getting socket state."
2477 2477
2478 -#: connect.c:384 connect.c:558 2478 +#: connect.c:382 connect.c:556
2479 msgid "ioctlsocket(FIONBIO) failed." 2479 msgid "ioctlsocket(FIONBIO) failed."
2480 msgstr "ioctlsocket(FIONBIO) failed." 2480 msgstr "ioctlsocket(FIONBIO) failed."
2481 2481
2482 -#: connect.c:414 connect.c:448 2482 +#: connect.c:412 connect.c:446
2483 msgid "setsockopt(SO_OOBINLINE) has failed" 2483 msgid "setsockopt(SO_OOBINLINE) has failed"
2484 msgstr "setsockopt(SO_OOBINLINE) has failed" 2484 msgstr "setsockopt(SO_OOBINLINE) has failed"
2485 2485
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @5c8b3bd
@@ -122,7 +122,7 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME).so @@ -122,7 +122,7 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME).so
122 $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) 122 $(BINRLS)/plugins/$(MODULE_NAME).so: $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o)
123 @echo " CCLD `basename $@`" 123 @echo " CCLD `basename $@`"
124 @$(MKDIR) `dirname $@` 124 @$(MKDIR) `dirname $@`
125 - $(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS) 125 + @$(LD) $(DLL_FLAGS) -Wl,-soname,`basename $@` $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(PW3270_LIBS) $(GLIB_LIBS) $(GTK_LIBS) $(GDBUS_LIBS)
126 126
127 $(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o) 127 $(BINRLS)/@PACKAGE_NAME@d: $(foreach SRC, $(basename $(DAEMON_SRC)), $(OBJRLS)/$(SRC).o)
128 @echo " CCLD `basename $@`" 128 @echo " CCLD `basename $@`"
src/plugins/rx3270/Makefile.in
  Diff comments   View file @5c8b3bd
@@ -47,7 +47,6 @@ LIBS=@REXX_LIBS@ @LIBICONV@ @DBUS_LIBS@ @@ -47,7 +47,6 @@ LIBS=@REXX_LIBS@ @LIBICONV@ @DBUS_LIBS@
47 CFLAGS=@REXX_CFLAGS@ @DBUS_CFLAGS@ 47 CFLAGS=@REXX_CFLAGS@ @DBUS_CFLAGS@
48 REXX_HOME=@REXX_HOME@ 48 REXX_HOME=@REXX_HOME@
49 REXXLIBDIR=@REXX_LIBDIR@ 49 REXXLIBDIR=@REXX_LIBDIR@
50 -SYSDLL_FLAGS=@SYSDLL_FLAGS@  
51 50
52 #---[ Debug Targets ]---------------------------------------------------------- 51 #---[ Debug Targets ]----------------------------------------------------------
53 52
@@ -59,5 +58,28 @@ $(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$( @@ -59,5 +58,28 @@ $(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(
59 $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) $(CLASS_DEBUG_OBJECTS) 58 $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) $(CLASS_DEBUG_OBJECTS)
60 @echo " CCLD `basename $@`" 59 @echo " CCLD `basename $@`"
61 @$(MKDIR) `dirname $@` 60 @$(MKDIR) `dirname $@`
62 - @$(CXX) $(SYSDLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS) 61 + @$(CXX) $(DLL_FLAGS) $(LDFLAGS) @LDSOFLAGS@ @DBGRPATH@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
  62 +
  63 +#---[ Release Targets ]--------------------------------------------------------
  64 +
  65 +$(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME)
  66 + @echo " CCLD `basename $@`"
  67 + @$(MKDIR) `dirname $@`
  68 + $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS)
  69 +
  70 +$(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) $(CLASS_RELEASE_OBJECTS)
  71 + @echo " CCLD `basename $@`"
  72 + @$(MKDIR) `dirname $@`
  73 + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(CLASS_LIBS)
  74 +
  75 +install:
  76 + @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugin
  77 + @$(INSTALL_PROGRAM) $(BINRLS)/$(PLUGIN_NAME) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins
  78 +
  79 + @$(MKDIR) $(DESTDIR)$(REXXLIBDIR)
  80 + @$(INSTALL_PROGRAM) $(BINRLS)$(DLL_NAME).$(VERSION) $(DESTDIR)$(REXXLIBDIR)
  81 + @$(LN_S) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@.$(VERSION) $(DESTDIR)$(REXXLIBDIR)/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@
  82 +
  83 + @$(MKDIR) $(DESTDIR)$(REXX_HOME)
  84 + @$(INSTALL_DATA) rx3270.cls $(DESTDIR)$(REXX_HOME)
63 85