Download as
Browse Code »

Commit 9c0d7eb28ffd196685b33744f22fffcffa702513

Authored by Perry Werneck
1 parent 03ced09f
Exists in develop

Fixing 'deb' builds, small adjustment in the entry tool.

Showing 4 changed files with 24 additions and 18 deletions   Show diff stats
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 export DH_VERBOSE=1 6 export DH_VERBOSE=1
7 7
8 # This is the debhelper compatibility version to use. 8 # This is the debhelper compatibility version to use.
9 -export DH_COMPAT=9 9 +export DH_COMPAT=9
10 10
11 # Name of the package 11 # Name of the package
12 PACKAGE_NAME=libv3270 12 PACKAGE_NAME=libv3270
@@ -23,12 +23,7 @@ build-stamp: @@ -23,12 +23,7 @@ build-stamp:
23 dh_testdir 23 dh_testdir
24 24
25 # Add here commands to compile the package. 25 # Add here commands to compile the package.
26 - aclocal  
27 - autoconf  
28 -  
29 - mkdir -p scripts  
30 - automake --add-missing 2> /dev/null | true  
31 - 26 + NOCONFIGURE=1 ./autogen.sh
32 ./configure --prefix=/usr 27 ./configure --prefix=/usr
33 make all 28 make all
34 # --- end custom part for compiling 29 # --- end custom part for compiling
@@ -41,11 +41,11 @@ @@ -41,11 +41,11 @@
41 <param name="outfilename">debian.control</param> 41 <param name="outfilename">debian.control</param>
42 </service> 42 </service>
43 43
44 - <service name="extract_file"> 44 + <!-- service name="extract_file">
45 <param name="archive">*.tar</param> 45 <param name="archive">*.tar</param>
46 <param name="files">*/debian/rules</param> 46 <param name="files">*/debian/rules</param>
47 <param name="outfilename">debian.rules</param> 47 <param name="outfilename">debian.rules</param>
48 - </service> 48 + </service -->
49 49
50 <service name="extract_file"> 50 <service name="extract_file">
51 <param name="archive">*.tar</param> 51 <param name="archive">*.tar</param>
rpm/libv3270.spec
  Diff comments   View file @9c0d7eb
@@ -29,15 +29,14 @@ BuildRequires: autoconf &gt;= 2.61 @@ -29,15 +29,14 @@ BuildRequires: autoconf &gt;= 2.61
29 BuildRequires: automake 29 BuildRequires: automake
30 BuildRequires: binutils 30 BuildRequires: binutils
31 BuildRequires: coreutils 31 BuildRequires: coreutils
  32 +BuildRequires: libtool
32 BuildRequires: gcc-c++ 33 BuildRequires: gcc-c++
33 BuildRequires: gettext-devel 34 BuildRequires: gettext-devel
34 BuildRequires: m4 35 BuildRequires: m4
35 BuildRequires: pkgconfig(gtk+-3.0) 36 BuildRequires: pkgconfig(gtk+-3.0)
36 BuildRequires: pkgconfig(lib3270) >= 5.4 37 BuildRequires: pkgconfig(lib3270) >= 5.4
37 -%if 0%{?centos_version}  
38 -# CENTOS Genmarshal doesn't depend on python!  
39 -BuildRequires: python  
40 -%endif 38 +
  39 +Suggests: %{name}-config
41 40
42 %description 41 %description
43 42
@@ -60,6 +59,16 @@ provides a TN3270 virtual terminal widget for GTK 3. @@ -60,6 +59,16 @@ provides a TN3270 virtual terminal widget for GTK 3.
60 59
61 For more details, see https://softwarepublico.gov.br/social/pw3270/ . 60 For more details, see https://softwarepublico.gov.br/social/pw3270/ .
62 61
  62 +%package config
  63 +Summary: Configuration files for the 3270 Virtual Terminal library
  64 +BuildArch: noarch
  65 +Requires: %{name}-%{_libvrs} = %{version}
  66 +Enhances: %{_product}
  67 +Conflicts: libv3270-5_3
  68 +
  69 +%description config
  70 +Originally designed as part of the pw3270 application, this package provides the configuration files required to %{name}.
  71 +
63 %package devel 72 %package devel
64 Summary: Header files for the 3270 Virtual Terminal library 73 Summary: Header files for the 3270 Virtual Terminal library
65 Requires: %{name}-%{_libvrs} = %{version} 74 Requires: %{name}-%{_libvrs} = %{version}
@@ -78,22 +87,24 @@ widgets in Glade. @@ -78,22 +87,24 @@ widgets in Glade.
78 %prep 87 %prep
79 %setup -q 88 %setup -q
80 NOCONFIGURE=1 ./autogen.sh 89 NOCONFIGURE=1 ./autogen.sh
81 -%configure --with-release=%{release} 90 +%configure --with-release=%{release} --disable-static
82 91
83 %build 92 %build
84 make all %{?_smp_mflags} 93 make all %{?_smp_mflags}
85 94
86 %install 95 %install
87 %make_install 96 %make_install
88 -%find_lang %{name} langfiles 97 +%find_lang %{name}-%{MAJOR_VERSION}.%{MINOR_VERSION} langfiles
89 98
90 %files -n %{name}-%{_libvrs} -f langfiles 99 %files -n %{name}-%{_libvrs} -f langfiles
91 %license LICENSE 100 %license LICENSE
92 %doc AUTHORS README.md 101 %doc AUTHORS README.md
93 %{_libdir}/%{name}.so.* 102 %{_libdir}/%{name}.so.*
94 -%{_datadir}/%{_product}/colors.conf 103 +
  104 +%files config
95 %dir %{_datadir}/%{_product}/remap/ 105 %dir %{_datadir}/%{_product}/remap/
96 -%{_datadir}/%{_product}/remap/*.xml 106 +%config %{_datadir}/%{_product}/colors.conf
  107 +%config %{_datadir}/%{_product}/remap/*.xml
97 108
98 %files devel 109 %files devel
99 %{_datadir}/pw3270/pot/*.pot 110 %{_datadir}/pw3270/pot/*.pot
src/tools/entry.c
  Diff comments   View file @9c0d7eb
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
140 140
141 } 141 }
142 142
143 - LIB3270_EXPORT void gtk_entry_bind_to_filechooser(GtkWidget *widget, GtkFileChooserAction action, const gchar *title, const gchar *icon_name, const gchar *pattern, const gchar *name) { 143 + LIB3270_EXPORT GtkWidget * gtk_entry_bind_to_filechooser(GtkWidget *widget, GtkFileChooserAction action, const gchar *title, const gchar *icon_name, const gchar *pattern, const gchar *name) {
144 144
145 gtk_entry_set_icon_from_icon_name( 145 gtk_entry_set_icon_from_icon_name(
146 GTK_ENTRY(widget), 146 GTK_ENTRY(widget),