Download as
Browse Code »

Commit 62355a0dc7c28162e4445fb468e3cddaeb02a545

Authored by perry.werneck@gmail.com
1 parent 556af124
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustes feitos enquanto o servidor svn.softwarepublico.gov.br estava fora

Showing 5 changed files with 109 additions and 17 deletions   Show diff stats
configure.ac
  Diff comments   View file @62355a0
... ... @@ -135,6 +135,7 @@ case "$host" in
135 135 DLLPREFIX=""
136 136  
137 137 # http://stackoverflow.com/questions/18138635/mingw-exe-requires-a-few-gcc-dlls-regardless-of-the-code
  138 + DLL_FLAGS="-shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup,--enable-auto-import"
138 139 SYSDLL_FLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--add-stdcall-alias,--enable-stdcall-fixup,--enable-auto-import"
139 140  
140 141 LDSOFLAGS="-Wl,-soname,\`basename \$@\`"
... ...
install-cross.sh
  Diff comments   View file @62355a0
1 1 #!/bin/bash
2 2  
3   -PREFIX="mingw32"
  3 +PREFIX="mingw64"
4 4  
5 5 TEMPFILE=$(mktemp)
6 6  
... ... @@ -28,8 +28,14 @@ gtk3-tools
28 28 headers
29 29 gnome-icon-theme
30 30 hicolor-icon-theme
  31 +gdk-pixbuf-loader-rsvg
  32 +libgdk_pixbuf-2_0-0
  33 +gdk-pixbuf-query-loaders
31 34 EOF
32 35  
  36 +# Instala o tema usado no pacote windows
  37 +sudo zypper in adwaita-icon-theme
  38 +
33 39 while read FILE
34 40 do
35 41 sudo zypper in ${PREFIX}-${FILE}
... ...
makegtkruntime.sh.in
  Diff comments   View file @62355a0
... ... @@ -30,7 +30,7 @@ copyFile() {
30 30 fi
31 31  
32 32 else
33   - echo "Can´t find $1"
  33 + echo "Can´t find ${GTK_PREFIX}/bin/${1}"
34 34 return 1
35 35 fi
36 36  
... ... @@ -71,6 +71,36 @@ copy_locale() {
71 71 rm -f $1
72 72 }
73 73  
  74 +CopyGTK3Theme() {
  75 +
  76 + mkdir -p ${TARGET_PATH}/share/icons
  77 + if [ "$?" != 0 ]; then
  78 + echo "Can´t create icons folder"
  79 + exit -1
  80 + fi
  81 +
  82 + cp -rv /usr/share/icons/${1} ${TARGET_PATH}/share/icons
  83 + if [ "$?" != 0 ]; then
  84 + echo "Can´t copy ${1} icons"
  85 + exit -1
  86 + fi
  87 +
  88 + mkdir -p ${TARGET_PATH}/share/themes
  89 + if [ "$?" != 0 ]; then
  90 + echo "Can´t create themes folder"
  91 + exit -1
  92 + fi
  93 +
  94 + cp -rv /usr/share/themes/${1} ${TARGET_PATH}/share/themes
  95 + if [ "$?" != 0 ]; then
  96 + echo "Can´t copy ${1} theme"
  97 + exit -1
  98 + fi
  99 +
  100 +
  101 +}
  102 +
  103 +
74 104 gtk3() {
75 105  
76 106 TEMPFILE="temp1.tmp"
... ... @@ -109,12 +139,28 @@ icule53.dll
109 139 icuuc53.dll
110 140 icudata53.dll
111 141 libgraphite2.dll
  142 +librsvg-*.dll
112 143 gspawn-win*-helper-console.exe
113 144 gspawn-win*-helper.exe
114 145 gdk-pixbuf-query-loaders.exe
115 146 EOF
116 147 copyFiles $TEMPFILE
117 148  
  149 +
  150 +# Copy loaders
  151 +GDK_LOADERS=$(${PKG_CONFIG} --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0)/loaders
  152 +GDK_PREFIX=$(${PKG_CONFIG} --variable=prefix gdk-pixbuf-2.0)
  153 +GDK_TARGET=$(echo ${GDK_LOADERS}/ | sed -e "s@${GDK_PREFIX}@@g")
  154 +
  155 +mkdir -p ${TARGET_PATH}/${GDK_TARGET}
  156 +
  157 +cp -v ${GDK_LOADERS}/* ${TARGET_PATH}/${GDK_TARGET}
  158 +if [ "$?" != 0 ]; then
  159 + echo "Can´t copy loaders"
  160 + exit -1
  161 +fi
  162 +
  163 +
118 164 # Copy optional files
119 165 copyFile libgcc_s_sjlj-1.dll
120 166 copyFile libgcc_s_seh-1.dll
... ... @@ -145,25 +191,64 @@ if [ "$?" != 0 ]; then
145 191 exit -1
146 192 fi
147 193  
148   -mkdir -p $TARGET_PATH/share/icons/hicolor
149   -if [ "$?" != 0 ]; then
150   - echo "Can´t create icons folder"
151   - exit -1
152   -fi
153   -
154   -cp -rv $GTK_PREFIX/share/icons/hicolor $TARGET_PATH/share/icons/hicolor
155   -if [ "$?" != 0 ]; then
156   - echo "Can´t copy icons"
157   - exit -1
158   -fi
  194 +# Copia Adwaita
  195 +CopyGTK3Theme "Adwaita"
  196 +
  197 +#mkdir -p $TARGET_PATH/share/icons/Adwaita
  198 +#if [ "$?" != 0 ]; then
  199 +# echo "Can´t create icons folder"
  200 +# exit -1
  201 +#fi
  202 +#
  203 +#cp -rv /usr/share/icons/Adwaita $TARGET_PATH/share/icons/Adwaita
  204 +#if [ "$?" != 0 ]; then
  205 +# echo "Can´t copy icons"
  206 +# exit -1
  207 +#fi
  208 +#
  209 +#mkdir -p $TARGET_PATH/share/themes/Adwaita
  210 +#if [ "$?" != 0 ]; then
  211 +# echo "Can´t create Adwaita theme"
  212 +# exit -1
  213 +#fi
  214 +#
  215 +#cp -rv /usr/share/themes/Adwaita $TARGET_PATH/share/themes/Adwaita
  216 +#if [ "$?" != 0 ]; then
  217 +# echo "Can´t copy Adwaita theme"
  218 +# exit -1
  219 +#fi
  220 +
  221 +
  222 +# Copia gnome
  223 +#mkdir -p $TARGET_PATH/share/icons/gnome
  224 +#if [ "$?" != 0 ]; then
  225 +# echo "Can´t create icons folder"
  226 +# exit -1
  227 +#fi
  228 +#
  229 +#cp -rv $GTK_PREFIX/share/icons/gnome $TARGET_PATH/share/icons/gnome
  230 +#if [ "$?" != 0 ]; then
  231 +# echo "Can´t copy icons"
  232 +# exit -1
  233 +#fi
159 234  
160 235 mkdir -p $TARGET_PATH/etc
161   -cp -rv $GTK_PREFIX/etc/gtk-3.0 $TARGET_PATH/etc
  236 +cp -rv $GTK_PREFIX/etc/gtk-3.0 $TARGET_PATH/etc/gtk-3.0
162 237 if [ "$?" != 0 ]; then
163 238 echo "Can´t copy theme"
164 239 exit -1
165 240 fi
166 241  
  242 +cat > $TARGET_PATH/etc/gtk-3.0/settings.ini << EOF
  243 +[Settings]
  244 +gtk-theme-name = Adwaita
  245 +gtk-icon-theme-name = Adwaita
  246 +gtk-fallback-icon-theme = Adwaita
  247 +gtk-font-name = Sans 10
  248 +gtk-toolbar-style =
  249 +gtk-menu-images = 1
  250 +gtk-button-images = 1
  251 +EOF
167 252  
168 253 }
169 254  
... ...
po/pt_BR.po
  Diff comments   View file @62355a0
... ... @@ -5,7 +5,7 @@ msgid &quot;&quot;
5 5 msgstr ""
6 6 "Project-Id-Version: pw3270 5.0\n"
7 7 "Report-Msgid-Bugs-To: \n"
8   -"POT-Creation-Date: 2015-07-07 09:37-0300\n"
  8 +"POT-Creation-Date: 2015-08-05 08:41-0300\n"
9 9 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
10 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 11 "Language-Team: Portugues <>\n"
... ...
pw3270-i686.nsi.in
  Diff comments   View file @62355a0
... ... @@ -122,7 +122,7 @@ SubSection &quot;@PACKAGE@&quot; SecMain
122 122  
123 123 CreateDirectory "$INSTDIR\plugins"
124 124 file "/oname=$INSTDIR\plugins\hllapi.dll" ".bin\Release\plugins\hllapi.dll"
125   - file "/oname=$SYSDIR\libhllapi.dll" ".bin\Release\hllapi.dll"
  125 + file "/oname=$SYSDIR\libhllapi.dll" ".bin\Release\hllapi.dll.@PACKAGE_VERSION@"
126 126  
127 127 sectionEnd
128 128  
... ... @@ -135,7 +135,7 @@ SubSection &quot;@PACKAGE@&quot; SecMain
135 135  
136 136 file "/oname=$PROGRAMFILES\ooRexx\rx3270.cls" "src\plugins\rx3270\rx3270.cls"
137 137 file "/oname=$INSTDIR\rx3270.dll.@PACKAGE_VERSION@" ".bin\Release\rx3270.dll.@PACKAGE_VERSION@"
138   - file "/oname=$PROGRAMFILES\ooRexx\rx3270.dll" ".bin\Release\rx3270.dll"
  138 + file "/oname=$PROGRAMFILES\ooRexx\rx3270.dll" ".bin\Release\rx3270.dll.@PACKAGE_VERSION@"
139 139  
140 140 sectionEnd
141 141  
... ...