From 37bf41dbec69fc9f36ffbb22b424f65b0161b598 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Wed, 18 Aug 2021 09:25:41 -0300 Subject: [PATCH] Working on windows package. --- win/makeruntime.sh.in | 7 +++++++ win/pack.sh | 3 ++- win/pw3270.nsi.in | 7 +++++++ win/x86_32/mingw32-pw3270.spec | 4 ++++ win/x86_64/mingw64-pw3270.spec | 1 + 5 files changed, 21 insertions(+), 1 deletion(-) diff --git a/win/makeruntime.sh.in b/win/makeruntime.sh.in index 2933fa5..93a5e36 100755 --- a/win/makeruntime.sh.in +++ b/win/makeruntime.sh.in @@ -25,6 +25,13 @@ # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) # +# +# Referencias: +# +# https://www.gtk.org/docs/installations/windows/ +# http://drup.org/gtk-warning-error-loading-icon-couldnt-recognize-image-file-format +# + # Get myDIR myDIR=$(dirname $(readlink -f "${0}")) diff --git a/win/pack.sh b/win/pack.sh index 99d7ee5..6dc8fe4 100755 --- a/win/pack.sh +++ b/win/pack.sh @@ -129,7 +129,8 @@ prepare() for spec in $(find ${WORKDIR}/sources/${1}/win/${ARCH} -name "*.spec") do echo "Parsing ${spec}" - grep -i buildrequires "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' >> ${WORKDIR}/sources/pre-reqs + grep -i "^Requires:" "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' >> ${WORKDIR}/sources/pre-reqs + grep -i "^BuildRequires:" "${spec}" | grep -v "%" | cut -d: -f2- | tr -d '[:blank:]' >> ${WORKDIR}/sources/pre-reqs done fi diff --git a/win/pw3270.nsi.in b/win/pw3270.nsi.in index e1caf81..49caa81 100644 --- a/win/pw3270.nsi.in +++ b/win/pw3270.nsi.in @@ -124,6 +124,8 @@ SubSection "@PRODUCT_NAME@" SecMain file "/oname=$INSTDIR\schemas\@PRODUCT_NAME@-application.gschema.xml" "share\glib-2.0\schemas\pw3270-application.gschema.xml" file "/oname=$INSTDIR\schemas\@PRODUCT_NAME@-window.gschema.xml" "share\glib-2.0\schemas\pw3270-window.gschema.xml" + file "/oname=$INSTDIR\gschemas.compiled" "runtime/share/glib-2.0/schemas/gschemas.compiled" + # Configuration files file "/oname=$INSTDIR\colors.conf" "share\@PRODUCT_NAME@\colors.conf" @@ -523,5 +525,10 @@ Function .onInit FunctionEnd +Function .onInstSuccess + + # Update GTK Image loaders + +FunctionEnd diff --git a/win/x86_32/mingw32-pw3270.spec b/win/x86_32/mingw32-pw3270.spec index edca993..a2b274d 100644 --- a/win/x86_32/mingw32-pw3270.spec +++ b/win/x86_32/mingw32-pw3270.spec @@ -39,6 +39,10 @@ Url: http://www.softwarepublico.gov.br/dotlrn/clubs/pw3270 Source: pw3270-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: mingw32-gtk3 +Requires: mingw32-lib3270 = %{version} +Requires: mingw32-hicolor-icon-theme + Provides: mingw32-pw3270-%{MAJOR_VERSION}_%{MINOR_VERSION} Conflicts: otherproviders(mingw32-pw3270-%{MAJOR_VERSION}_%{MINOR_VERSION}) diff --git a/win/x86_64/mingw64-pw3270.spec b/win/x86_64/mingw64-pw3270.spec index 9e81b98..018c54e 100644 --- a/win/x86_64/mingw64-pw3270.spec +++ b/win/x86_64/mingw64-pw3270.spec @@ -41,6 +41,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mingw64-gtk3 Requires: mingw64-lib3270 = %{version} +Requires: mingw64-hicolor-icon-theme Provides: mingw64(lib:pw3270) = %{version} Requires: mingw64-lib3270-%{MAJOR_VERSION}_%{MINOR_VERSION} = %{version} -- libgit2 0.21.2