From c95c96a43ae97c284893908951375cedd8a58ef2 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 18 Jan 2017 17:23:24 -0200 Subject: [PATCH] Testando empacotamento. --- configure.ac | 2 ++ locale/pw3270.pot | 4 ++-- rpm/pw3270.spec | 2 +- src/pw3270/Makefile.in | 18 +++++++++++++++++- src/pw3270/pixmaps/pw3270-logo.svg | 155 ----------------------------------------------------------------------------------------------------------------------------------------------------------- src/pw3270/pixmaps/pw3270.svg | 155 ----------------------------------------------------------------------------------------------------------------------------------------------------------- src/pw3270/svg/pw3270-logo.svg | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/pw3270/svg/pw3270.svg | 155 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 332 insertions(+), 314 deletions(-) delete mode 100644 src/pw3270/pixmaps/pw3270-logo.svg delete mode 100644 src/pw3270/pixmaps/pw3270.svg create mode 100644 src/pw3270/svg/pw3270-logo.svg create mode 100644 src/pw3270/svg/pw3270.svg diff --git a/configure.ac b/configure.ac index a3eff4f..4702237 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,8 @@ AC_PATH_TOOL([MSGINIT], [msginit], [no]) AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) AC_PATH_TOOL([VALGRIND], [valgrind], [no]) +AC_PATH_TOOL([SVG2PNG],[rsvg-convert],[no]) +AC_PATH_TOOL([OPTIPNG],[optipng],[no]) AC_CHECK_HEADER(libintl.h, [ AC_DEFINE(HAVE_LIBINTL, 1) diff --git a/locale/pw3270.pot b/locale/pw3270.pot index 3e6ff76..d693237 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -9,7 +9,7 @@ msgstr "" "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-18 16:20-0200\n" +"POT-Creation-Date: 2017-01-18 17:22-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "" "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-18 16:20-0200\n" +"POT-Creation-Date: 2017-01-18 17:22-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/rpm/pw3270.spec b/rpm/pw3270.spec index d895b3a..5e9c40b 100644 --- a/rpm/pw3270.spec +++ b/rpm/pw3270.spec @@ -129,7 +129,7 @@ BuildRequires: gettext-devel BuildRequires: m4 BuildRequires: pkgconfig BuildRequires: sed - +BuildRequires: optipng %description Open-source GTK-based IBM 3270 terminal emulator with many advanced features. It can be used to communicate with any IBM host that supports 3270-style connections over TELNET. diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 47c8026..10174cc 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -72,6 +72,8 @@ CC=@CC@ LD=@CC@ XGETTEXT=@XGETTEXT@ MSGCAT=@MSGCAT@ +SVG2PNG=@SVG2PNG@ +OPTIPNG=@OPTIPNG@ CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ \ -Wno-deprecated-declarations \ @@ -141,6 +143,14 @@ $(SRCDIR)/%: \ @make -C `dirname $<` $@ +$(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/%.png: \ + svg/%.svg + + @echo $< ... + @$(MKDIR) `dirname $@` + @$(SVG2PNG) $< --format=png > $@ + @$(OPTIPNG) -o7 $@ + #---[ Release Targets ]------------------------------------------------------------------ all: \ @@ -189,7 +199,9 @@ $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @$(LD) -shared -Wl,-soname,$(@F) $(LDFLAGS) -L$(BINRLS) -o $@ $^ $(LIBS) install: \ - $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) + $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT) \ + $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME).png \ + $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/$(PACKAGE_NAME)-logo.png @$(MKDIR) $(DESTDIR)$(libdir) @@ -219,6 +231,10 @@ $(SRCDIR): \ @$(MKDIR) $@ @$(INSTALL_DATA) *.c *.h *.in *.cbp $@ + @$(MKDIR) $@/svg + @$(INSTALL_DATA) svg/*.svg $@/svg + + #---[ Debug Targets ]-------------------------------------------------------------------- Debug: \ diff --git a/src/pw3270/pixmaps/pw3270-logo.svg b/src/pw3270/pixmaps/pw3270-logo.svg deleted file mode 100644 index e18f0c8..0000000 --- a/src/pw3270/pixmaps/pw3270-logo.svg +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/src/pw3270/pixmaps/pw3270.svg b/src/pw3270/pixmaps/pw3270.svg deleted file mode 100644 index ebd2f7c..0000000 --- a/src/pw3270/pixmaps/pw3270.svg +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - diff --git a/src/pw3270/svg/pw3270-logo.svg b/src/pw3270/svg/pw3270-logo.svg new file mode 100644 index 0000000..e18f0c8 --- /dev/null +++ b/src/pw3270/svg/pw3270-logo.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/pw3270/svg/pw3270.svg b/src/pw3270/svg/pw3270.svg new file mode 100644 index 0000000..ebd2f7c --- /dev/null +++ b/src/pw3270/svg/pw3270.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + -- libgit2 0.21.2