diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-29 10:37:36 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-04-29 10:37:36 +0200 |
| commit | e7fca19e8659c6c5b6fbb34527b129e655514f1e (patch) | |
| tree | c9401e3d97a233417fb9fea6ba36fcaa4b74f2b1 /community/seahorse-nautilus/glib236.patch | |
| parent | 0a1081b50cec0fd8e54282d5f503feb0769eaa4f (diff) | |
| parent | bab69e0f720c6f189c4486b7b945079be23f0a4b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-dataenc/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/python-pyzmq/PKGBUILD
extra/cabal-install/PKGBUILD
extra/gtk-qt-engine/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
Diffstat (limited to 'community/seahorse-nautilus/glib236.patch')
| -rw-r--r-- | community/seahorse-nautilus/glib236.patch | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/community/seahorse-nautilus/glib236.patch b/community/seahorse-nautilus/glib236.patch new file mode 100644 index 000000000..d0ab03046 --- /dev/null +++ b/community/seahorse-nautilus/glib236.patch @@ -0,0 +1,12 @@ +diff -Naur seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c +--- seahorse-nautilus-3.8.0.orig/tool/seahorse-tool-progress.c 2011-10-24 09:25:37.000000000 +0200 ++++ seahorse-nautilus-3.8.0/tool/seahorse-tool-progress.c 2013-04-28 22:26:54.483276592 +0200 +@@ -226,8 +226,6 @@ + progress_fd = -1; + return; + } +- +- g_child_watch_add (progress_pid, progress_cancel, NULL); + } + + void |