From 993bf1d8a4a1c9263638b37ffa3b05a3d305af9a Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Mon, 30 Jan 2023 18:35:37 -0300 Subject: [PATCH] Updating package. --- arch/PKGBUILD | 5 +++-- locale/pw3270.pot | 2 +- rpm/pw3270.spec | 55 ++++++++++++++++++------------------------------------- src/objects/os/windows/savedesktopicon.c | 2 +- win/pack.sh | 34 +++++++++++++--------------------- 5 files changed, 36 insertions(+), 62 deletions(-) diff --git a/arch/PKGBUILD b/arch/PKGBUILD index 3013e4b..81f5893 100644 --- a/arch/PKGBUILD +++ b/arch/PKGBUILD @@ -8,11 +8,12 @@ pkgdesc="IBM 3270 Terminal emulator for GTK" url="https://portal.softwarepublico.gov.br/social/pw3270/" arch=(i686 x86_64) license=(GPL) -depends=() +depends=(libv3270) +optdepends=('pw3270-plugin-ipc: D-Bus remote control' 'pw3270-keypads: Aditional screen keypads') makedepends=(autoconf automake make openssl lib3270 gtk3 libv3270 python3 dbus dbus-glib imagemagick optipng gzip) checkdepends=() -#groups=(gnome) +groups=(gnome) source=($pkgname-$pkgver.tar.xz) sha256sums=('SKIP') diff --git a/locale/pw3270.pot b/locale/pw3270.pot index a04cea6..7440c54 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-18 12:47-0300\n" +"POT-Creation-Date: 2023-01-30 11:48-0300\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 5d7d918..da8e42f 100644 --- a/rpm/pw3270.spec +++ b/rpm/pw3270.spec @@ -13,12 +13,16 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://github.com/PerryWerneck/pw3270/issues # - %define _product %(pkg-config --variable=product_name lib3270) +%define plugindir %(pkg-config --variable=plugin_path lib3270) +%if "%{plugindir}" == "" + %define plugindir /usr/lib64/pw3270-plugins +%endif + #---[ Packaging ]----------------------------------------------------------------------------------------------------- Name: pw3270 @@ -51,8 +55,7 @@ Recommends: libv3270-config BuildRequires: glib2-devel BuildRequires: gtk3-devel -BuildRequires: libappstream-glib -BuildRequires: libv3270-devel >= 5.3 +BuildRequires: libv3270-devel >= 5.4 %endif @@ -60,10 +63,9 @@ BuildRequires: libv3270-devel >= 5.3 %if 0%{?fedora} -BuildRequires: libappstream-glib BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libv3270) >= 5.3 +BuildRequires: pkgconfig(libv3270) >= 5.4 %endif @@ -75,7 +77,7 @@ BuildRequires: appstream-glib BuildRequires: update-desktop-files BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(libv3270) >= 5.3 +BuildRequires: pkgconfig(libv3270) >= 5.4 %glib2_gsettings_schema_requires @@ -106,14 +108,14 @@ Based on the original x3270 code, pw3270 was originally created for Banco do Bra #--[ Configuration & Branding ]--------------------------------------------------------------------------------------- %package branding -Summary: Default branding for %{name} -Group: System/X11/Terminals +Summary: Default branding for %{name} +Group: System/X11/Terminals -Requires: %{name} = %{version} -BuildArch: noarch +Requires: %{name} = %{version} +BuildArch: noarch -Requires(post): desktop-file-utils -Requires(postun):desktop-file-utils +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils %description branding 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. @@ -128,24 +130,6 @@ This package contains the default branding for %{name}. %global _lto_cflags %{_lto_cflags} -ffat-lto-objects NOCONFIGURE=1 ./autogen.sh -# Pull request #20 broke SLE-12 builds -update_for_compatibility() { - sed -i -e "s|@APPLICATION_ID@|@APPLICATION_ID@.desktop|" branding/metainfo.xml.in - sed -i -e "s|||" branding/metainfo.xml.in -} - -%if 0%{?suse_version} - %if 0%{?suse_version} < 1500 - update_for_compatibility - %endif -%endif - -%if 0%{?fedora} - %if 0%{?fedora_version} < 27 - update_for_compatibility - %endif -%endif - %configure --with-release=%{release} CFLAGS="${CFLAGS} -fpie" LDFLAGS="${LDFLAGS} -pie" %build @@ -159,7 +143,9 @@ make all -j1 %find_lang pw3270 langfiles +%if 0%{?suse_version} appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml +%endif %fdupes %{buildroot}/%{_prefix} @@ -171,18 +157,13 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainf # Main application %dir %{_datadir}/%{_product} %dir %{_datadir}/%{_product}/keypad -%dir %{_libdir}/%{_product}-plugins +%dir %{plugindir} %dir %{_datadir}/%{_product}/icons %{_bindir}/%{_product} # Desktop files %{_datadir}/applications/*.desktop - -%if 0%{?suse_version} < 1500 -%dir %{_datadir}/metainfo -%endif - %{_datadir}/metainfo/*.metainfo.xml # Icons diff --git a/src/objects/os/windows/savedesktopicon.c b/src/objects/os/windows/savedesktopicon.c index e016cae..4b259b4 100644 --- a/src/objects/os/windows/savedesktopicon.c +++ b/src/objects/os/windows/savedesktopicon.c @@ -238,7 +238,7 @@ static HRESULT CreateShortCut(const char * pszTargetfile, const char * pszTarget HRESULT hRes = CoCreateInstance( - &CLSID_ShellLink, // predefined CLSID of the IShellLink object + CLSID_ShellLink, // predefined CLSID of the IShellLink object NULL, // pointer to parent interface if part of aggregate CLSCTX_INPROC_SERVER, // caller and called code are in same process &IID_IShellLink, // predefined interface of the IShellLink object diff --git a/win/pack.sh b/win/pack.sh index 2fd830d..b3ccf8f 100755 --- a/win/pack.sh +++ b/win/pack.sh @@ -1,35 +1,27 @@ #!/bin/bash # -# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270 -# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a -# aplicativos mainframe. Registro no INPI sob o nome G3270. +# SPDX-License-Identifier: LGPL-3.0-or-later # # Copyright (C) <2008> # -# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob -# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela -# Free Software Foundation. +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER -# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO -# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para -# obter mais detalhes. -# -# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este -# programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin -# St, Fifth Floor, Boston, MA 02110-1301 USA -# -# Contatos: -# -# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) -# erico.mendonca@gmail.com (Erico Mascarenhas Mendonça) +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . # PRODUCT_NAME="pw3270" LIBRARY_NAME="lib3270" CORE_LIBRARIES="lib3270 libv3270 libipc3270" -PACKAGE_PLUGINS="" +PACKAGE_PLUGINS="ipc" PACKAGE_EXTRAS="libhllapi pw3270-keypads" #TARGET_ARCHS="x86_64 x86_32" @@ -271,7 +263,7 @@ buildLibrary() } # -# Build language binding +# Build extra package # buildExtraPackage() { -- libgit2 0.21.2