Commit f07ce111d5d5455d14807ff693c651e0eb5f048f

Authored by Perry Werneck
1 parent 158dcc7a
Exists in develop

Working on win32 package.

Showing 2 changed files with 31 additions and 20 deletions   Show diff stats
win/makeruntime.sh.in
@@ -216,7 +216,7 @@ install_schemas() { @@ -216,7 +216,7 @@ install_schemas() {
216 fi 216 fi
217 } 217 }
218 218
219 -install_icons() { 219 +install_theme() {
220 220
221 mkdir -p "${buildroot}${prefix}/etc" 221 mkdir -p "${buildroot}${prefix}/etc"
222 cp -rv "${prefix}/etc/gtk-3.0" "${buildroot}${prefix}/etc" 222 cp -rv "${prefix}/etc/gtk-3.0" "${buildroot}${prefix}/etc"
@@ -230,19 +230,7 @@ install_icons() { @@ -230,19 +230,7 @@ install_icons() {
230 rm -f ${buildroot}${prefix}/etc/gtk-3.0/gtkrc 230 rm -f ${buildroot}${prefix}/etc/gtk-3.0/gtkrc
231 231
232 echo "[Settings]" > ${buildroot}${prefix}/etc/gtk-3.0/settings.ini 232 echo "[Settings]" > ${buildroot}${prefix}/etc/gtk-3.0/settings.ini
233 - echo "gtk-theme-name=win32" >> ${buildroot}${prefix}/etc/gtk-3.0/settings.ini  
234 -  
235 - mkdir -p ${buildroot}${prefix}/share/icons  
236 - if [ "$?" != 0 ]; then  
237 - echo "Can´t create icons folder"  
238 - exit -1  
239 - fi  
240 -  
241 - cp -rv /usr/share/icons ${buildroot}${prefix}/share/icons  
242 - if [ "$?" != 0 ]; then  
243 - echo "Can´t copy ${1} icons"  
244 - exit -1  
245 - fi 233 + echo "gtk-theme-name=${1}" >> ${buildroot}${prefix}/etc/gtk-3.0/settings.ini
246 234
247 if [ -e "${srcdir}/win/gtk.css" ]; then 235 if [ -e "${srcdir}/win/gtk.css" ]; then
248 mkdir -p "${buildroot}${prefix}/share/themes/Default/gtk-3.0" 236 mkdir -p "${buildroot}${prefix}/share/themes/Default/gtk-3.0"
@@ -251,18 +239,39 @@ install_icons() { @@ -251,18 +239,39 @@ install_icons() {
251 239
252 } 240 }
253 241
254 -install_theme() {  
255 - cp -rv /usr/share/icons/${1} ${buildroot}${prefix}/share/icons  
256 - if [ "$?" != 0 ]; then  
257 - echo "Can´t copy ${1} icons" 242 +install_icons() {
  243 +
  244 + mkdir -p "${buildroot}${prefix}/share/icons"
  245 +
  246 + if [ -d "${prefix}/share/icons/${1}" ]; then
  247 +
  248 + cp -rv "${prefix}/share/icons/${1}" "${buildroot}${prefix}/share/icons"
  249 + if [ "$?" != 0 ]; then
  250 + echo "Can´t copy ${1} icons"
  251 + exit -1
  252 + fi
  253 +
  254 + elif [ -d "/usr/share/icons/${1}" ]; then
  255 +
  256 + cp -rv "/usr/share/icons/${1}" "${buildroot}${prefix}/share/icons"
  257 + if [ "$?" != 0 ]; then
  258 + echo "Can´t copy ${1} icons"
  259 + exit -1
  260 + fi
  261 +
  262 + else
  263 +
  264 + echo "Can´t find ${1} icons"
258 exit -1 265 exit -1
  266 +
259 fi 267 fi
  268 +
260 } 269 }
261 270
262 install_bin 271 install_bin
263 install_locale 272 install_locale
264 install_schemas 273 install_schemas
265 -install_icons  
266 -# install_theme "Adwaita" 274 +install_theme "Adwaita"
  275 +install_icons "Adwaita"
267 276
268 277
1 #!/bin/bash 1 #!/bin/bash
2 2
  3 +rm -fr ${PWD}/.build
  4 +
3 make DESTDIR=${PWD}/.build install 5 make DESTDIR=${PWD}/.build install
4 if [ "$?" != "0" ]; then 6 if [ "$?" != "0" ]; then
5 exit -1 7 exit -1