Download as
Browse Code »

Commit 5580c22912e7906b674df48223b4327af4f9810f

Authored by Perry Werneck
2 parents e9be4471 4b42dcb0
Exists in master and in 1 other branch develop

Merge branch 'stable' into develop

Showing 15 changed files with 68 additions and 15 deletions   Show diff stats
configure.ac
  Diff comments   View file @5580c22
... ... @@ -198,7 +198,7 @@ AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product
198 198 AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
199 199 AC_SUBST(PRODUCT_NAME,$app_cv_product)
200 200  
201   -AC_ARG_WITH([application-id], [AS_HELP_STRING([--application-id], [Set the application ID])], [ app_cv_application_id="$withval" ],[ app_cv_application_id="br.com.bb.$app_cv_product" ])
  201 +AC_ARG_WITH([application-id], [AS_HELP_STRING([--application-id], [Set the application ID])], [ app_cv_application_id="$withval" ],[ app_cv_application_id="br.app.$app_cv_product" ])
202 202  
203 203 AC_DEFINE_UNQUOTED(APPLICATION_ID, $app_cv_application_id)
204 204 AC_SUBST(APPLICATION_ID,$app_cv_application_id)
... ...
flathub/br.app.pw3270.yml 0 → 100644
  Diff comments   View file @5580c22
... ... @@ -0,0 +1,53 @@
  1 +app-id: br.app.pw3270
  2 +runtime: org.gnome.Platform
  3 +sdk: org.gnome.Sdk
  4 +command: pw3270
  5 +finish-args:
  6 + - "--share=network"
  7 + - "--share=ipc"
  8 + - "--socket=fallback-x11"
  9 + - "--socket=wayland"
  10 + - "--own-name=br.app.pw3270"
  11 +cleanup:
  12 + - "/include"
  13 + - "/lib/pkgconfig"
  14 + - "/man"
  15 + - "/share/doc"
  16 + - "/share/gtk-doc"
  17 + - "/share/man"
  18 + - "/share/pkgconfig"
  19 + - "*.la"
  20 + - "*.a"
  21 +modules:
  22 + - name: lib3270
  23 + buildsystem: simple
  24 + build-commands:
  25 + - NOCONFIGURE=1 ./autogen.sh
  26 + - ./configure --prefix=/app
  27 + - make all
  28 + - make install
  29 + sources:
  30 + - type: git
  31 + url: https://github.com/PerryWerneck/lib3270
  32 + - name: libv3270
  33 + buildsystem: simple
  34 + build-commands:
  35 + - NOCONFIGURE=1 ./autogen.sh
  36 + - ./configure --prefix=/app PKG_CONFIG_PATH=/app/lib/pkgconfig CFLAGS=-I/app/include LDFLAGS=-L/app/lib
  37 + - make all
  38 + - make install
  39 + sources:
  40 + - type: git
  41 + url: https://github.com/PerryWerneck/libv3270
  42 + - name: pw3270
  43 + buildsystem: simple
  44 + build-commands:
  45 + - NOCONFIGURE=1 ./autogen.sh
  46 + - ./configure --prefix=/app PKG_CONFIG_PATH=/app/lib/pkgconfig CFLAGS=-I/app/usr/include LDFLAGS=-L/app/lib
  47 + - make all
  48 + - make install
  49 + sources:
  50 + - type: git
  51 + url: https://github.com/PerryWerneck/pw3270
  52 +
  53 +
... ...
macos/Info.plist
  Diff comments   View file @5580c22
... ... @@ -11,7 +11,7 @@
11 11 <key>CFBundleIconFile</key>
12 12 <string>pw3270.icns</string>
13 13 <key>CFBundleIdentifier</key>
14   - <string>br.com.bb.pw3270</string>
  14 + <string>br.app.pw3270</string>
15 15 <key>NSHighResolutionCapable</key>
16 16 <true/>
17 17 <key>LSMinimumSystemVersion</key>
... ...
schemas/linux/application.gschema.xml.in
  Diff comments   View file @5580c22
... ... @@ -30,7 +30,7 @@
30 30  
31 31 <schemalist>
32 32  
33   - <schema path="/br/com/bb/@PRODUCT_NAME@/" id="br.com.bb.@PRODUCT_NAME@">
  33 + <schema path="/br/app/@PRODUCT_NAME@/" id="br.app.@PRODUCT_NAME@">
34 34  
35 35 <key name="ui-style" type="u">
36 36 <default>2</default>
... ...
schemas/linux/window.gschema.xml.in
  Diff comments   View file @5580c22
... ... @@ -30,7 +30,7 @@
30 30  
31 31 <schemalist>
32 32  
33   - <schema path="/br/com/bb/@PRODUCT_NAME@/window/" id="br.com.bb.@PRODUCT_NAME@.window">
  33 + <schema path="/br/app/@PRODUCT_NAME@/window/" id="br.app.@PRODUCT_NAME@.window">
34 34  
35 35 <key name="width" type="i">
36 36 <default>-1</default>
... ...
schemas/macos/application.gschema.xml.in
  Diff comments   View file @5580c22
... ... @@ -30,7 +30,7 @@
30 30  
31 31 <schemalist>
32 32  
33   - <schema path="/br/com/bb/@PRODUCT_NAME@/" id="br.com.bb.@PRODUCT_NAME@">
  33 + <schema path="/br/app/@PRODUCT_NAME@/" id="br.app.@PRODUCT_NAME@">
34 34  
35 35 <key name="ui-style" type="u">
36 36 <default>2</default>
... ...
schemas/macos/window.gschema.xml.in
  Diff comments   View file @5580c22
... ... @@ -30,7 +30,7 @@
30 30  
31 31 <schemalist>
32 32  
33   - <schema path="/br/com/bb/@PRODUCT_NAME@/window/" id="br.com.bb.@PRODUCT_NAME@.window">
  33 + <schema path="/br/app/@PRODUCT_NAME@/window/" id="br.app.@PRODUCT_NAME@.window">
34 34  
35 35 <key name="width" type="i">
36 36 <default>-1</default>
... ...
schemas/windows/application.gschema.xml.in
  Diff comments   View file @5580c22
... ... @@ -30,7 +30,7 @@
30 30  
31 31 <schemalist>
32 32  
33   - <schema path="/br/com/bb/@PRODUCT_NAME@/" id="br.com.bb.@PRODUCT_NAME@">
  33 + <schema path="/br/app/@PRODUCT_NAME@/" id="br.app.@PRODUCT_NAME@">
34 34  
35 35 <key name="ui-style" type="u">
36 36 <default>0</default>
... ...
schemas/windows/window.gschema.xml.in
  Diff comments   View file @5580c22
... ... @@ -30,7 +30,7 @@
30 30  
31 31 <schemalist>
32 32  
33   - <schema path="/br/com/bb/@PRODUCT_NAME@/window/" id="br.com.bb.@PRODUCT_NAME@.window">
  33 + <schema path="/br/app/@PRODUCT_NAME@/window/" id="br.app.@PRODUCT_NAME@.window">
34 34  
35 35 <key name="width" type="i">
36 36 <default>-1</default>
... ...
src/main/windows/app-manifest.xml.in
  Diff comments   View file @5580c22
... ... @@ -3,7 +3,7 @@
3 3 <assemblyIdentity
4 4 version="@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@"
5 5 processorArchitecture="*"
6   - name="br.com.bb.@PRODUCT_NAME@"
  6 + name="br.app.@PRODUCT_NAME@"
7 7 type="win32"
8 8 />
9 9 <description>@PACKAGE_DESCRIPTION@</description>
... ...
src/objects/actions/testprogram/testprogram.c
  Diff comments   View file @5580c22
... ... @@ -117,7 +117,7 @@ int main (int argc, char **argv) {
117 117 GtkApplication *app;
118 118 int status;
119 119  
120   - app = gtk_application_new ("br.com.bb.pw3270",G_APPLICATION_FLAGS_NONE);
  120 + app = gtk_application_new ("br.app.pw3270",G_APPLICATION_FLAGS_NONE);
121 121  
122 122 g_signal_connect (app, "activate", G_CALLBACK(activate), NULL);
123 123  
... ...
src/objects/keypad/testprogram/testprogram.c
  Diff comments   View file @5580c22
... ... @@ -74,7 +74,7 @@ int main (int argc, char **argv) {
74 74 GtkApplication *app;
75 75 int status;
76 76  
77   - app = gtk_application_new ("br.com.bb.pw3270.keypad",G_APPLICATION_FLAGS_NONE);
  77 + app = gtk_application_new ("br.app.pw3270.keypad",G_APPLICATION_FLAGS_NONE);
78 78  
79 79 g_signal_connect (app, "activate", G_CALLBACK(activate), NULL);
80 80  
... ...
src/objects/settings/gsettings.c
  Diff comments   View file @5580c22
... ... @@ -148,9 +148,9 @@
148 148 }
149 149  
150 150 GSettings * pw3270_application_settings_new() {
151   - return settings_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME));
  151 + return settings_new("br.app." G_STRINGIFY(PRODUCT_NAME));
152 152 }
153 153  
154 154 GSettings * pw3270_application_window_settings_new() {
155   - return settings_new("br.com.bb." G_STRINGIFY(PRODUCT_NAME) ".window");
  155 + return settings_new("br.app." G_STRINGIFY(PRODUCT_NAME) ".window");
156 156 }
... ...
src/objects/toolbar/testprogram/testprogram.c
  Diff comments   View file @5580c22
... ... @@ -94,7 +94,7 @@ int main (int argc, char **argv) {
94 94 GtkApplication *app;
95 95 int status;
96 96  
97   - app = gtk_application_new ("br.com.bb.pw3270",G_APPLICATION_FLAGS_NONE);
  97 + app = gtk_application_new ("br.app.pw3270",G_APPLICATION_FLAGS_NONE);
98 98  
99 99 g_signal_connect (app, "activate", G_CALLBACK(activate), NULL);
100 100  
... ...
src/objects/window/testprogram/testprogram.c
  Diff comments   View file @5580c22
... ... @@ -80,7 +80,7 @@ int main (int argc, char **argv) {
80 80 GtkApplication *app;
81 81 int status;
82 82  
83   - app = pw3270_application_new("br.com.bb.pw3270",G_APPLICATION_HANDLES_OPEN);
  83 + app = pw3270_application_new("br.app.pw3270",G_APPLICATION_HANDLES_OPEN);
84 84 status = g_application_run (G_APPLICATION (app), argc, argv);
85 85 g_object_unref (app);
86 86  
... ...