diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-17 13:18:12 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-10-17 13:18:12 -0200 |
| commit | a098c771b2caa364ae95b65818c93726751e8f16 (patch) | |
| tree | 96f72edbb1712e34fb0f8f6485d73773c543e83b | |
| parent | fd71cf956b60f6088161fe3e230e53eb2dd1b9a1 (diff) | |
spacefm-0.9.4-3.parabola1: fix freezes with glib 2.41
| -rw-r--r-- | libre/spacefm/PKGBUILD | 9 | ||||
| -rw-r--r-- | libre/spacefm/spacefm-0.9.4-glib-2.41.patch | 25 |
2 files changed, 31 insertions, 3 deletions
diff --git a/libre/spacefm/PKGBUILD b/libre/spacefm/PKGBUILD index 5159a11b0..66e896239 100644 --- a/libre/spacefm/PKGBUILD +++ b/libre/spacefm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 116546 2014-07-29 18:12:51Z bpiotrowski $ +# $Id: PKGBUILD 120827 2014-10-16 15:48:31Z bpiotrowski $ # Maintainer (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ # Contributor (Arch): ridikulus_rat <the.ridikulus.rat@gmail.com> @@ -7,7 +7,7 @@ pkgname=spacefm pkgver=0.9.4 -pkgrel=2.parabola1 +pkgrel=3.parabola1 pkgdesc='Multi-panel tabbed file manager, with unar support' arch=('i686' 'x86_64' 'mips64el') url='http://ignorantguru.github.com/spacefm/' @@ -30,9 +30,12 @@ md5sums=('daeee7dcccea33d6258a0a9d783470c4' '30ba2b4b8f5ae7bf1552689b192eab89') prepare() { - # replace nonfree unrar with unar support cd $pkgname-$pkgver + # replace nonfree unrar with unar support patch -Np1 -i $srcdir/libre.patch src/ptk/ptk-file-archiver.c + + # fix freezes with glib 2.41 + patch -p1 -i ../spacefm-0.9.4-glib-2.41.patch } build() { diff --git a/libre/spacefm/spacefm-0.9.4-glib-2.41.patch b/libre/spacefm/spacefm-0.9.4-glib-2.41.patch new file mode 100644 index 000000000..5795c77a8 --- /dev/null +++ b/libre/spacefm/spacefm-0.9.4-glib-2.41.patch @@ -0,0 +1,25 @@ +diff --git a/src/main.c b/src/main.c +index a7307fb..af5dc5a 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -1349,7 +1349,9 @@ int main ( int argc, char *argv[] ) + vfs_file_monitor_clean(); + return ret == -1 ? 0 : ret; + } ++ GDK_THREADS_ENTER(); + gtk_main(); ++ GDK_THREADS_LEAVE(); + vfs_file_monitor_clean(); + return 0; + } +@@ -1509,8 +1511,10 @@ int main ( int argc, char *argv[] ) + run = handle_parsed_commandline_args(); + app_settings.load_saved_tabs = TRUE; + ++ GDK_THREADS_ENTER(); + if( run ) /* run the main loop */ + gtk_main(); ++ GDK_THREADS_LEAVE(); + + main_window_event( NULL, NULL, "evt_exit", 0, 0, NULL, 0, 0, 0, FALSE ); + |