diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 853596d..d6c569c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -62,7 +62,6 @@ jobs: sudo apt-get update sudo apt-get install --yes meson pkg-config python3-dev pkg-config lib3270-dev libgtk-3-dev - # Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 8ab152f..f035eab 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -2,6 +2,7 @@ name: check-msys2 on: push: branches: [ "win" ] + tags: [ "*" ] pull_request: branches: [ "master" ] @@ -23,14 +24,8 @@ jobs: msystem: mingw64 update: true install: dos2unix mingw-w64-x86_64-meson mingw-w64-x86_64-gcc git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl mingw-w64-x86_64-gtk3 - - uses: robinraju/release-downloader@v1.7 - with: - repository: "PerryWerneck/lib3270" - latest: true - fileName: "mingw-w64-x86_64-lib3270-5.5.0-0-x86_64.pkg.tar.zst" - name: CI-Build run: | - pacman -U --noconfirm *.pkg.tar.zst - dos2unix PKGBUILD.mingw - makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw + meson setup --prefix=/usr .build + meson compile -C .build diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 0d08c0d..0000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,83 +0,0 @@ -name: Publish -on: - push: - branches: [ "publish" ] - tags: [ "*" ] - -jobs: - publish-mingw: - runs-on: windows-latest - defaults: - run: - shell: msys2 {0} - steps: - - uses: actions/checkout@v3 - - uses: oprypin/find-latest-tag@v1 - id: gettag - with: - repository: PerryWerneck/libv3270 - releases-only: true - - uses: msys2/setup-msys2@v2 - with: - msystem: mingw64 - update: true - install: dos2unix mingw-w64-x86_64-gcc automake autoconf make git pkgconf mingw-w64-x86_64-gettext gettext-devel mingw-w64-x86_64-openssl libtool mingw-w64-x86_64-gtk3 - - uses: robinraju/release-downloader@v1.7 - with: - repository: "PerryWerneck/lib3270" - latest: true - fileName: "mingw-w64-x86_64-lib3270-5.4-0-x86_64.pkg.tar.zst" - - name: CI-Build - run: | - pacman -U --noconfirm *.pkg.tar.zst - dos2unix PKGBUILD.mingw - makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw - - uses: ncipollo/release-action@v1 - with: - tag: ${{ steps.gettag.outputs.tag }} - artifacts: "*v3270*.pkg.tar.zst" - allowUpdates: true - draft: false - makeLatest: true - omitBody: true - omitPrereleaseDuringUpdate: true - replacesArtifacts: true - publish-macos: - runs-on: macos-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - uses: oprypin/find-latest-tag@v1 - id: gettag - with: - repository: PerryWerneck/lib3270 - releases-only: true - - name: Install Pre reqs - run: | - brew update - brew install xz automake binutils coreutils curl gettext libtool openssl pkgconfig gtk+3 - find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete - find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete - find /usr/local/lib/node_modules/npm -delete - rm -f /usr/local/bin/go || true - rm -f /usr/local/bin/gofmt || true - brew upgrade - - uses: robinraju/release-downloader@v1.7 - with: - repository: "PerryWerneck/lib3270" - latest: true - fileName: "macos-lib3270.tar.xz" - - name: build - run: ./mac/ci-build.sh - - uses: ncipollo/release-action@v1 - with: - tag: ${{ steps.gettag.outputs.tag }} - artifacts: "*v3270.tar.xz" - allowUpdates: true - draft: false - makeLatest: true - omitBody: true - omitPrereleaseDuringUpdate: true - replacesArtifacts: true - - diff --git a/.gitignore b/.gitignore index efbdbb0..bef1066 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ po marshal libtool .vscode +lib3270 diff --git a/CHANGELOG b/CHANGELOG index 8c10bfa..e23e727 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,13 @@ +------------------------------------------------------------------- +Thu Feb 27 16:32:03 UTC 2025 - Perry Werneck + +- Removing fixed meson version. + ------------------------------------------------------------------- Thu Dec 12 19:21:39 UTC 2024 - perry.werneck@gmail.com - Update to version 5.5.0+git20241211: * Disabling glade catalog on windows build. - * Publishing updated version 5.5.0 * Disabling static libraries * Updating codeql workflow. * Fixing glade install. @@ -11,7 +15,6 @@ Thu Dec 12 19:21:39 UTC 2024 - perry.werneck@gmail.com * Adding link to documentation. * Fixing static sdk. * Fixing pkg-config control file. - * Installing data files. * Adding headers. * Updating windows resources. * Refactoring to meson build system. diff --git a/PKGBUILD.mingw b/PKGBUILD.mingw index 3c8af0a..c52d423 100644 --- a/PKGBUILD.mingw +++ b/PKGBUILD.mingw @@ -23,9 +23,9 @@ pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} source=() -pkgver=$(grep AC_INIT "${startdir}/configure.ac" | cut -d[ -f3 | cut -d] -f1) +pkgver=5.5.0 pkgrel=0 -pkgdesc="TN3270 Access library" +pkgdesc="3270 Virtual Terminal for GTK" url="https://github.com/PerryWerneck/${_realname}" arch=(i686 x86_64) license=(LGPL-3.0-or-later) diff --git a/README.md b/README.md index 0b6a24e..83494b0 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Created originally as part of [PW3270](../../../pw3270) application. [![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) -![CodeQL](https://github.com/PerryWerneck/libv3270/workflows/CodeQL/badge.svg?branch=master) +[![CodeQL Advanced](https://github.com/PerryWerneck/libv3270/actions/workflows/codeql.yml/badge.svg)](https://github.com/PerryWerneck/libv3270/actions/workflows/codeql.yml) [![build result](https://build.opensuse.org/projects/home:PerryWerneck:pw3270/packages/libv3270/badge.svg?type=percent)](https://build.opensuse.org/package/show/home:PerryWerneck:pw3270/libv3270) [![Publish](https://github.com/PerryWerneck/libv3270/actions/workflows/publish.yml/badge.svg)](https://github.com/PerryWerneck/libv3270/actions/workflows/publish.yml) @@ -13,10 +13,6 @@ Created originally as part of [PW3270](../../../pw3270) application. [Download from open build service]([https://software.opensuse.org/download.html?project=home%3APerryWerneck%3Apw3270&package=pw3270](https://software.opensuse.org/download.html?project=home%3APerryWerneck%3Apw3270&package=libv3270)) -### Windows - - * TODO - ## Building for Linux ### Requirements @@ -24,11 +20,6 @@ Created originally as part of [PW3270](../../../pw3270) application. * [GTK3](https://www.gtk.org/) * [lib3270](../../../lib3270) -### Building - - * TODO - - ## Building for windows ### Cross-compiling on SuSE Linux (Native or WSL) @@ -38,7 +29,6 @@ Created originally as part of [PW3270](../../../pw3270) application. ``` sudo zypper ar obs://windows:mingw:win32 mingw32 sudo zypper ar obs://windows:mingw:win64 mingw64 - sudo zypper ar obs://home:PerryWerneck:pw3270 pw3270 sudo zypper ref ``` @@ -48,48 +38,71 @@ Created originally as part of [PW3270](../../../pw3270) application. git clone https://github.com/PerryWerneck/libv3270.git ./v3270 ``` -3. Install 64 bits cross compilers +3. Install cross compilers - ``` - ./v3270/win/install-cross.sh --64 + ```shell + sudo zypper in \ + pkgconfig \ + gettext-devel \ + mingw64-libcurl-devel \ + mingw64-cross-meson \ + mingw64-libopenssl-devel \ + mingw64-cross-gcc-c++ \ + 'mingw64(pkg:gtk+-win32-3.0)' \ + 'mingw64(lib:iconv)' \ + 'mingw64(lib:intl)' ``` -4. Configure 64 bits build environment +3. Configure and build - ``` - ./v3270/win/win-configure.sh --64 + ```shell + meson setup --cross-file /usr/lib/rpm/macros.d/meson-mingw64-cross-file.txt .build + meson compile -C .build ``` -5. Build +### Windows native with MSYS2 +1. Install and update MSYS2 + + * Download and install [msys2](https://www.msys2.org/) + * Update msys: + + ```shell + pacman -Syu ``` - cd v3270 - make clean - make all - ``` + Afther this close and reopen mingw shell. -### Windows native with MSYS2 +2. Update system path -1. Build and install [lib3270](../../../lib3270) + * Add c:\msys64\usr\bin and c:\msys64\mingw64\bin to system path -2. Install the required libraries +3. Install devel packages using pacman on mingw shell - ``` - pacman -S mingw-w64-x86_64-gtk3 + ```shell + pacman -S \ + dos2unix \ + mingw-w64-x86_64-gcc \ + mingw-w64-x86_64-meson \ + mingw-w64-x86_64-iconv \ + pkgconf \ + mingw-w64-x86_64-gettext \ + gettext-devel \ + mingw-w64-x86_64-openssl \ + mingw-w64-x86_64-gtk3 ``` -2. Get libv3270 sources from git + Afther this close and reopen mingw shell. + +4. Get libv3270 sources from git ``` git clone https://github.com/PerryWerneck/libv3270.git ./libv3270 ``` -4. Build library using the mingw shell +5. Build using makepkg - ``` - cd libv3270 - ./autogen.sh - make all + ```shell + makepkg BUILDDIR=/tmp/pkg -p PKGBUILD.mingw ``` ## Building for macOS @@ -129,16 +142,4 @@ To uninstall rm -fr "$(brew --cellar)/libv3270" ``` -### Using jhbuild - -1. Install jhbuild and GTK-OSX - - https://wiki.gnome.org/Projects/GTK/OSX/Building - -2. build - - ```shell - jhbuild --moduleset=https://raw.githubusercontent.com/PerryWerneck/libv3270/master/mac/libv3270.modules build libv3270 - ``` - diff --git a/debian/rules b/debian/rules index b8eca96..570ac3f 100644 --- a/debian/rules +++ b/debian/rules @@ -23,7 +23,7 @@ build-stamp: dh_testdir # Add here commands to compile the package. - meson setup --prefix=/usr .build + meson setup --buildtype=release --prefix=/usr .build # --- end custom part for compiling touch build-stamp diff --git a/meson.build b/meson.build index 6743e27..166dc1d 100644 --- a/meson.build +++ b/meson.build @@ -22,6 +22,7 @@ project( ['c'], version: '5.5.0', license: 'GPL-3.0-or-later', + default_options : [ 'buildtype=release' ] ) project_description = '3270 Virtual Terminal for GTK' @@ -84,13 +85,13 @@ subdir('po') # lib3270 = dependency('lib3270', fallback: [ 'lib3270', 'dynamic_library' ]) m_dep = cc.find_library('m', required: false) +gtk = dependency('gtk+-3.0') +gmodule = dependency('gmodule-2.0') lib_deps = [ lib3270, - dependency('glib-2.0'), - dependency('gtk+-3.0'), - dependency('gmodule-2.0'), - dependency('gdk-3.0'), + gtk, + gmodule, m_dep, ] @@ -236,38 +237,19 @@ lib_src = [ 'src/trace/text.c', 'src/trace/trace.c', 'src/trace/tracewindow.c', + 'src/dialogs/' + host_machine.system() + '/select.c', + 'src/selection/' + host_machine.system() + '/copy.c', + 'src/selection/' + host_machine.system() + '/paste.c', + 'src/terminal/' + host_machine.system() + '/init.c', + 'src/terminal/' + host_machine.system() + '/iosource.c', ] if host_machine.system() == 'windows' lib_src += [ - 'src/dialogs/windows/select.c', - 'src/selection/windows/copy.c', - 'src/selection/windows/paste.c', - 'src/terminal/windows/init.c', - 'src/terminal/windows/iosource.c', 'src/terminal/windows/registry.c', ] endif -if host_machine.system() == 'linux' - lib_src += [ - 'src/dialogs/linux/select.c', - 'src/terminal/linux/init.c', - 'src/terminal/linux/iosource.c', - 'src/selection/linux/copy.c', - 'src/selection/linux/paste.c', - ] -endif - -if host_machine.system() == 'darwin' - lib_src += [ - 'src/terminal/macos/init.c', - 'src/terminal/macos/iosource.c', - 'src/dialogs/macos/select.c', - 'src/selection/macos/copy.c', - 'src/selection/macos/paste.c', - ] -endif # # Gnome @@ -337,7 +319,7 @@ if host_machine.system() == 'windows' name: meson.project_name(), description: project_description, variables: pkg_variables, - requires: [ 'lib3270' ], + requires: [ 'lib3270', gtk, gmodule ], libraries: [ '-lv3270.dll' ] ) @@ -347,7 +329,7 @@ else name: meson.project_name(), description: project_description, variables: pkg_variables, - requires: [ 'lib3270' ], + requires: [ 'lib3270', gtk, gmodule ], libraries: [ '-lv3270' ] ) diff --git a/po/POTFILES.in b/po/POTFILES.in index 85e7fa4..f682c5f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,7 +6,6 @@ src/dialogs/font/model.c src/dialogs/font/select.c src/dialogs/linux/select.c src/dialogs/load.c -src/dialogs/macos/select.c src/dialogs/popups.c src/dialogs/print/begin.c src/dialogs/print/convenience.c @@ -31,6 +30,7 @@ src/dialogs/togglebutton.c src/dialogs/tools.c src/dialogs/transfer.c src/dialogs/windows/select.c +src/dialogs/darwin/select.c src/filetransfer/activity.c src/filetransfer/activitylist.c src/filetransfer/filelist.c @@ -99,8 +99,8 @@ src/terminal/keyboard/map.c src/terminal/keyfile.c src/terminal/linux/init.c src/terminal/linux/iosource.c -src/terminal/macos/init.c src/terminal/macos/iosource.c +src/terminal/macos/init.c src/terminal/mouse.c src/terminal/properties/get.c src/terminal/properties/init.c @@ -119,3 +119,33 @@ src/trace/property.c src/trace/text.c src/trace/trace.c src/trace/tracewindow.c +src/dialogs/print/private.h +src/dialogs/private.h +src/dialogs/save/private.h +src/dialogs/settings/private.h +src/filetransfer/private.h +src/include/clipboard.h +src/include/hostselect.h +src/include/internals.h +src/include/save.h +src/include/terminal.h +src/include/v3270.h +src/include/v3270/accessible.h +src/include/v3270/actions.h +src/include/v3270/colorscheme.h +src/include/v3270/dialogs.h +src/include/v3270/filetransfer.h +src/include/v3270/ftprogress.h +src/include/v3270/print.h +src/include/v3270/security.h +src/include/v3270/selection.h +src/include/v3270/settings.h +src/include/v3270/settings/url.h +src/include/v3270/toggle.h +src/include/v3270/tools.h +src/include/v3270/trace.h +src/terminal/actions/private.h +src/terminal/font/private.h +src/terminal/keyboard/private.h +src/terminal/properties/private.h +src/trace/private.h diff --git a/po/pt_BR.po b/po/pt_BR.po index eaa5192..af1d14e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,19 +5,17 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-12-11 05:58-0300\n" -"PO-Revision-Date: 2021-11-22 22:07-0300\n" +"POT-Creation-Date: 2025-08-14 21:48-0300\n" +"PO-Revision-Date: 2025-06-29 21:46-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Portuguese\n" -"X-Poedit-Country: BRAZIL\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Poedit-SourceCharset: utf-8\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" -"X-Generator: Gtranslator 3.38.0\n" +"X-Generator: Poedit 3.6\n" #: src/dialogs/font/chooser.c:267 msgid "Available fonts" @@ -40,11 +38,11 @@ msgid "Font" msgstr "Fonte" #: src/dialogs/linux/select.c:51 src/dialogs/linux/select.c:77 -#: src/dialogs/load.c:204 src/dialogs/macos/select.c:51 -#: src/dialogs/macos/select.c:77 src/dialogs/popups.c:192 +#: src/dialogs/load.c:204 src/dialogs/popups.c:192 #: src/dialogs/print/settingsdialog.c:412 #: src/dialogs/print/settingsdialog.c:431 src/dialogs/save/save.c:341 #: src/dialogs/settings/dialog.c:203 src/dialogs/windows/select.c:158 +#: src/dialogs/darwin/select.c:51 src/dialogs/darwin/select.c:77 #: src/selection/linux/paste.c:85 src/selection/macos/paste.c:85 #: src/selection/windows/paste.c:83 src/selection/windows/paste.c:123 msgid "_Cancel" @@ -114,7 +112,7 @@ msgstr "Erro na operação de impressão" #: src/dialogs/print/print.c:75 msgid "The print settings should be stored." -msgstr "Configuração de impressão deve ser armazenada" +msgstr "Configuração de impressão deve ser armazenada." #: src/dialogs/print/print.c:80 msgid "" @@ -160,7 +158,7 @@ msgstr "Atividade já está na fila" #: src/dialogs/print/settingsdialog.c:243 msgid "You can't add more than one acitivity with the same files." -msgstr "Você não pode adicionar mais de uma operação com os mesmos arquivos" +msgstr "Você não pode adicionar mais de uma operação com os mesmos arquivos." #: src/dialogs/print/settingsdialog.c:246 msgid "Can't add activity" @@ -397,7 +395,7 @@ msgstr "Detectar http:// ou https://" #: src/dialogs/settings/clipboard.c:175 msgid "When set URLs selected with double click will be opened" -msgstr "Quando ativo URLs selecionadas com duplo clique serão abertas." +msgstr "Quando ativo URLs selecionadas com duplo clique serão abertas" #: src/dialogs/settings/clipboard.c:251 msgid "Select options" @@ -759,7 +757,7 @@ msgstr "Tabela de _Caracteres" #: src/dialogs/settings/host.c:562 msgid "The EBCDIC host character set. " -msgstr "A tabela de caracteres EBCDIC." +msgstr "Tabela de caracteres EBCDIC definida." #: src/dialogs/settings/host.c:580 msgid "Host settings" @@ -864,11 +862,11 @@ msgstr "Caminho completo do arquivo remoto" #: src/filetransfer/activitylist.c:252 msgid "Local file" -msgstr "Arquivo local:" +msgstr "Arquivo local" #: src/filetransfer/activitylist.c:261 msgid "Remote file" -msgstr "Arquivo remoto:" +msgstr "Arquivo remoto" #: src/filetransfer/activitylist.c:383 src/filetransfer/v3270ft.c:200 msgid "Load queue from file" @@ -1030,7 +1028,7 @@ msgstr "Receber arquivo texto" #: src/filetransfer/tables.c:157 msgid "Record Length" -msgstr "Comprimento de registro:" +msgstr "Comprimento de registro" #: src/filetransfer/tables.c:158 msgid "" @@ -1044,7 +1042,7 @@ msgstr "" #: src/filetransfer/tables.c:166 msgid "Block size" -msgstr "Tamanho do bloco:" +msgstr "Tamanho do bloco" #: src/filetransfer/tables.c:167 msgid "" @@ -1088,7 +1086,7 @@ msgstr "" #: src/filetransfer/tables.c:194 msgid "DFT B_uffer size" -msgstr "Tamanho do b_uffer DFT:" +msgstr "Tamanho do b_uffer DFT" #: src/filetransfer/tables.c:195 msgid "Specifies the default buffer size for DFT IND$FILE file transfers." @@ -1168,19 +1166,19 @@ msgstr "Skip this transfer, keep the file on queue." #: src/filetransfer/transfer.c:91 msgid "Cancel transfer operation." -msgstr "Cancelar transferência" +msgstr "Cancelar transferência." #: src/filetransfer/v3270ft.c:332 msgid "_Operation" -msgstr "_Operação:" +msgstr "_Operação" #: src/filetransfer/v3270ft.c:333 msgid "_Local file" -msgstr "Arquivo _local:" +msgstr "Arquivo _local" #: src/filetransfer/v3270ft.c:334 msgid "_Remote file" -msgstr "Arquivo _remoto:" +msgstr "Arquivo _remoto" #: src/filetransfer/v3270ft.c:370 msgid "Get transfer queue from an external XML file" @@ -1446,7 +1444,7 @@ msgid "_Paste as text" msgstr "_Colar como texto" #: src/selection/linux/paste.c:116 src/selection/macos/paste.c:116 -#, fuzzy +#: src/selection/windows/paste.c:115 msgid "Unable to paste formatted data." msgstr "Incapaz de colar dados formatados." @@ -1458,11 +1456,6 @@ msgstr "Nenhuma das telas da área de transferência corresponde à atual." msgid "Can't paste text" msgstr "Não é possível colar texto" -#: src/selection/windows/paste.c:115 -#, fuzzy -msgid "Unable to paste formatted data" -msgstr "Incapaz de colar dados formatados." - #: src/terminal/accessible.c:100 msgid "3270 screen" msgstr "Tela 3270" @@ -1672,7 +1665,7 @@ msgstr "Reduzir" #: src/terminal/actions/table.c:214 msgid "decrease the font size" -msgstr "Diminui o tamanho da fonte" +msgstr "diminui o tamanho da fonte" #: src/terminal/actions/table.c:224 msgid "Fit best" @@ -1966,6 +1959,9 @@ msgstr "_Arquivo" msgid "Save _As" msgstr "Salvar _Como" +#~ msgid "Unable to paste formatted data" +#~ msgstr "Incapaz de colar dados formatados" + #~ msgid " and %s for %s." #~ msgstr " e %s para %s." diff --git a/rpm/_service b/rpm/_service index 3b7304a..f919368 100644 --- a/rpm/_service +++ b/rpm/_service @@ -5,7 +5,7 @@ https://github.com/PerryWerneck/libv3270.git - enable + perry.werneck@gmail.com develop diff --git a/rpm/libv3270.spec b/rpm/libv3270.spec index 51aae4d..fd5e79d 100644 --- a/rpm/libv3270.spec +++ b/rpm/libv3270.spec @@ -1,7 +1,7 @@ # # spec file for package libv3270 # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # Copyright (c) 2008 Banco do Brasil S.A. # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: libv3270 -Version: 5.5.0+git20241211 +Version: 5.5.0 Release: 0 Summary: 3270 Virtual Terminal for GTK License: LGPL-3.0-only @@ -29,14 +29,9 @@ BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: m4 -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(lib3270) >= 5.4 - -%if 0%{?suse_version} == 01500 -BuildRequires: meson >= 0.61.4 -%else BuildRequires: meson -%endif +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(lib3270) >= 5.5.0 Suggests: %{name}-config diff --git a/src/dialogs/macos/select.c b/src/dialogs/darwin/select.c similarity index 100% rename from src/dialogs/macos/select.c rename to src/dialogs/darwin/select.c diff --git a/src/selection/windows/paste.c b/src/selection/windows/paste.c index d903d29..7c1fb5f 100644 --- a/src/selection/windows/paste.c +++ b/src/selection/windows/paste.c @@ -112,7 +112,7 @@ static void formatted_received(GtkClipboard *clipboard, GtkSelectionData *select GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, - _("Unable to paste formatted data") + _("Unable to paste formatted data.") ); diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c index dc16807..1cb3788 100644 --- a/src/testprogram/testprogram.c +++ b/src/testprogram/testprogram.c @@ -48,6 +48,10 @@ #include #include + #if !GTK_CHECK_VERSION(2,74,0) + #define G_APPLICATION_DEFAULT_FLAGS 0 + #endif + /*---[ Implement ]----------------------------------------------------------------------------------*/ static void session_changed(GtkWidget *terminal, GtkWidget *window) { diff --git a/subprojects/lib3270.wrap b/subprojects/lib3270.wrap new file mode 100644 index 0000000..918bbf2 --- /dev/null +++ b/subprojects/lib3270.wrap @@ -0,0 +1,5 @@ +[wrap-git] +url = https://github.com/PerryWerneck/lib3270.git +revision = HEAD +depth = 1 + diff --git a/win/ci-build.sh b/windows/ci-build.sh similarity index 100% rename from win/ci-build.sh rename to windows/ci-build.sh diff --git a/win/x86_32/_service b/windows/x86_32/_service similarity index 100% rename from win/x86_32/_service rename to windows/x86_32/_service diff --git a/win/x86_32/mingw32-libv3270.spec b/windows/x86_32/mingw32-libv3270.spec similarity index 100% rename from win/x86_32/mingw32-libv3270.spec rename to windows/x86_32/mingw32-libv3270.spec diff --git a/win/x86_64/CHANGELOG b/windows/x86_64/CHANGELOG similarity index 100% rename from win/x86_64/CHANGELOG rename to windows/x86_64/CHANGELOG diff --git a/win/x86_64/_service b/windows/x86_64/_service similarity index 100% rename from win/x86_64/_service rename to windows/x86_64/_service diff --git a/win/x86_64/mingw64-libv3270.spec b/windows/x86_64/mingw64-libv3270.spec similarity index 100% rename from win/x86_64/mingw64-libv3270.spec rename to windows/x86_64/mingw64-libv3270.spec