Download as
Browse Code »

Commit 1797660727ca15ec7a7a9f1fa4368cfa08910b14

Authored by Perry Werneck
1 parent 3ce86dc0
Exists in develop

Using converted icon to avoid requirements of inkscape and convert on 

build action.
Showing 7 changed files with 23 additions and 40 deletions   Show diff stats
.github/workflows/winpkg.yml
  Diff comments   View file @1797660
@@ -26,8 +26,7 @@ jobs: @@ -26,8 +26,7 @@ jobs:
26 update: true 26 update: true
27 install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf 27 install: xz mingw-w64-x86_64-gcc automake autoconf make git pkgconf
28 mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl 28 mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl
29 - libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-imagemagick  
30 - mingw-w64-x86_64-optipng mingw-w64-x86_64-inkscape 29 + libtool mingw-w64-x86_64-gtk3 mingw-w64-x86_64-optipng
31 - uses: robinraju/release-downloader@v1.7 30 - uses: robinraju/release-downloader@v1.7
32 with: 31 with:
33 repository: PerryWerneck/lib3270 32 repository: PerryWerneck/lib3270
@@ -72,7 +72,6 @@ MSGCAT=@MSGCAT@ @@ -72,7 +72,6 @@ MSGCAT=@MSGCAT@
72 WINDRES=@WINDRES@ 72 WINDRES=@WINDRES@
73 AR=@AR@ 73 AR=@AR@
74 VALGRIND=@VALGRIND@ 74 VALGRIND=@VALGRIND@
75 -CONVERT=@CONVERT@  
76 STRIP=@STRIP@ 75 STRIP=@STRIP@
77 76
78 #---[ Build Paths ]---------------------------------------------------------------------- 77 #---[ Build Paths ]----------------------------------------------------------------------
@@ -127,6 +126,13 @@ $(OBJDBG)/%.o: \ @@ -127,6 +126,13 @@ $(OBJDBG)/%.o: \
127 -DDEBUG=1 \ 126 -DDEBUG=1 \
128 -o $@ -c $< 127 -o $@ -c $<
129 128
  129 +%.ico: \
  130 + $(srcdir)/branding/%.ico
  131 +
  132 + @echo $< ...
  133 + @$(MKDIR) $(@D)
  134 + @cp "$<" "$@"
  135 +
130 $(OBJDBG)/%.o: \ 136 $(OBJDBG)/%.o: \
131 %.rc \ 137 %.rc \
132 $(PRODUCT_NAME).ico 138 $(PRODUCT_NAME).ico
@@ -218,30 +224,6 @@ install-%: \ @@ -218,30 +224,6 @@ install-%: \
218 prefix=$(prefix) \ 224 prefix=$(prefix) \
219 install 225 install
220 226
221 -%.ico: \  
222 - $(srcdir)/branding/%.svg  
223 -  
224 - @echo $@ ...  
225 - @$(MKDIR) $(@D)  
226 - @$(CONVERT) \  
227 - -density 384 \  
228 - -background transparent \  
229 - $< \  
230 - -define icon:auto-resize \  
231 - -colors 256 \  
232 - $@  
233 -  
234 -%.png: \  
235 - $(srcdir)/branding/%.svg  
236 -  
237 - @echo $@ ...  
238 - @$(MKDIR) $(@D)  
239 - @$(CONVERT) \  
240 - +antialias \  
241 - -background transparent \  
242 - $< \  
243 - $@  
244 -  
245 #---[ Main Target ]---------------------------------------------------------------------- 227 #---[ Main Target ]----------------------------------------------------------------------
246 228
247 all: \ 229 all: \
branding/Makefile.in
  Diff comments   View file @1797660
@@ -43,19 +43,20 @@ MKDIR=@MKDIR_P@ @@ -43,19 +43,20 @@ MKDIR=@MKDIR_P@
43 INSTALL=@INSTALL@ 43 INSTALL=@INSTALL@
44 INSTALL_DATA=@INSTALL_DATA@ 44 INSTALL_DATA=@INSTALL_DATA@
45 INSTALL_PROGRAM=@INSTALL_PROGRAM@ 45 INSTALL_PROGRAM=@INSTALL_PROGRAM@
46 -CONVERT=@CONVERT@  
47 DESKTOP_INSTALL=@DESKTOP_INSTALL@ 46 DESKTOP_INSTALL=@DESKTOP_INSTALL@
48 SCOUR=@SCOUR@ 47 SCOUR=@SCOUR@
49 APPSTREAMCLI=@APPSTREAMCLI@ 48 APPSTREAMCLI=@APPSTREAMCLI@
50 49
51 -#---[ Rules ]---------------------------------------------------------------------------- 50 +# CONVERT=@CONVERT@
52 51
53 -%.ico: \  
54 - $(PRODUCT_NAME).svg 52 +#---[ Rules ]----------------------------------------------------------------------------
55 53
56 - @echo $@ ...  
57 - @$(MKDIR) `dirname $@`  
58 - @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@ 54 +#%.ico: \
  55 +# %.svg
  56 +#
  57 +# @echo $@ ...
  58 +# @$(MKDIR) `dirname $@`
  59 +# @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@
59 60
60 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.svg: \ 61 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/%.svg: \
61 $(srcdir)/%.svg 62 $(srcdir)/%.svg
@@ -101,11 +102,10 @@ endif @@ -101,11 +102,10 @@ endif
101 102
102 validate: 103 validate:
103 104
104 -ifneq ($(SCOUR),no) 105 +ifneq ($(APPSTREAMCLI),no)
105 @$(APPSTREAMCLI) validate metainfo.xml 106 @$(APPSTREAMCLI) validate metainfo.xml
106 endif 107 endif
107 108
108 -  
109 install: \ 109 install: \
110 install-@OSNAME@ 110 install-@OSNAME@
111 111
@@ -159,7 +159,10 @@ install-macos: \ @@ -159,7 +159,10 @@ install-macos: \
159 159
160 install-windows: \ 160 install-windows: \
161 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).svg \ 161 $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).svg \
162 - $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.svg \  
163 - $(DESTDIR)$(bindir)/$(PRODUCT_NAME).ico 162 + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME)-logo.svg
  163 +
  164 + @$(INSTALL_DATA) \
  165 + $(PRODUCT_NAME).ico \
  166 + $(DESTDIR)$(bindir)/$(PRODUCT_NAME).ico
164 167
165 168
branding/pw3270.ico 0 → 100644
View file @1797660
No preview for this file type
@@ -143,7 +143,6 @@ dnl --------------------------------------------------------------------------- @@ -143,7 +143,6 @@ dnl ---------------------------------------------------------------------------
143 143
144 AC_PATH_TOOL([AR], [ar], [ar]) 144 AC_PATH_TOOL([AR], [ar], [ar])
145 AC_PATH_TOOL([CONVERT], [convert], [no]) 145 AC_PATH_TOOL([CONVERT], [convert], [no])
146 -AC_PATH_TOOL([OPTIPNG],[optipng],[no])  
147 AC_PATH_TOOL([ZIP],[zip],[no]) 146 AC_PATH_TOOL([ZIP],[zip],[no])
148 AC_PATH_TOOL([DLLTOOL],[dlltool],[no]) 147 AC_PATH_TOOL([DLLTOOL],[dlltool],[no])
149 AC_PATH_TOOL([WINDRES], [windres], [no]) 148 AC_PATH_TOOL([WINDRES], [windres], [no])
locale/pw3270.pot
  Diff comments   View file @1797660
@@ -8,7 +8,7 @@ msgid &quot;&quot; @@ -8,7 +8,7 @@ msgid &quot;&quot;
8 msgstr "" 8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n" 9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n" 10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2023-01-31 11:13-0300\n" 11 +"POT-Creation-Date: 2023-03-20 19:00-0300\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n" 14 "Language-Team: LANGUAGE <LL@li.org>\n"
pw3270.ico
View file @3ce86dc
No preview for this file type