We should merge this soon as the time slot to the next release is again getting
smaller.
I noticed we need even more packages in order to be able to run Geany from the
created GTK bundle:
For GTK2 and GTK3:
pixman
gdk-pixbuf2
And for GTK3 additionally:
libepoxy
Not sure why we didn't need or notice these ones last time, maybe they are new
dependencies due to changed builds or versions or whatever.
Furthermore, I changed the script slightly to operate more explicitly when
moving the extracted package contents:
```diff
@@ -109,9 +115,14 @@
if [ -d mingw32 ]; then
for d in bin etc include lib locale share; do
- rm -rf $d
- mv mingw32/$d .
+ if [ -d "mingw32/$d" ]; then
+ rm -rf $d
+ mv mingw32/$d .
+ fi
done
+ rm -rf mingw32/var/cache/fontconfig
+ rmdir mingw32/var/cache
+ rmdir mingw32/var
rmdir mingw32
fi
```
The first part is just checking whether the subdirectories (etc include lib
locale share) actually exist before trying to `mv` and `rm` them. This prevents
unnecessary error messages like for `locale` which doesn't seem to exist on the
top-level, at least in my tests.
The second part is to remove the `mingw32/var/cache/fontconfig` directory which
gets created but we don't need, I guess. I used multiple `rmdir`s on purpose
here instead of a simple `rm -rf` to explicitly trigger an error and leave any
other unexpected contents there in case they are important and would get lost
unseen otherwise.
---
Reply to this email directly or view it on GitHub:
https://github.com/geany/geany/pull/560#issuecomment-166170993
