diff options
| -rw-r--r-- | libraries/libfm/libfm.SlackBuild | 7 | ||||
| -rw-r--r-- | libraries/libfm/libfm.info | 6 | ||||
| -rw-r--r-- | libraries/libfm/libfm_issue_3557764.patch | 42 |
3 files changed, 5 insertions, 50 deletions
diff --git a/libraries/libfm/libfm.SlackBuild b/libraries/libfm/libfm.SlackBuild index 6befe46162..5ac35aae1b 100644 --- a/libraries/libfm/libfm.SlackBuild +++ b/libraries/libfm/libfm.SlackBuild @@ -25,7 +25,7 @@ # slightly modified by Matteo Bernardini <ponce@slackbuilds.org> PRGNAM=libfm -VERSION=${VERSION:-1.0} +VERSION=${VERSION:-1.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,12 +71,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix a segfault reported on the issue tracker -# https://sourceforge.net/tracker/?func=detail&atid=801864&aid=3557764&group_id=156956 -patch -p1 < $CWD/libfm_issue_3557764.patch - sh autogen.sh || true +LDFLAGS="-lgobject-2.0 -lglib-2.0" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libfm/libfm.info b/libraries/libfm/libfm.info index 14435f37d1..a8c0f76b80 100644 --- a/libraries/libfm/libfm.info +++ b/libraries/libfm/libfm.info @@ -1,8 +1,8 @@ PRGNAM="libfm" -VERSION="1.0" +VERSION="1.0.1" HOMEPAGE="http://pcmanfm.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/pcmanfm/libfm-1.0.tar.gz" -MD5SUM="9f978eb58c72a6623021504832a9da1b" +DOWNLOAD="http://downloads.sourceforge.net/pcmanfm/libfm-1.0.1.tar.gz" +MD5SUM="7fb406f38f99c9171661f72fa6d4da7f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="menu-cache vala" diff --git a/libraries/libfm/libfm_issue_3557764.patch b/libraries/libfm/libfm_issue_3557764.patch deleted file mode 100644 index adec5a84f9..0000000000 --- a/libraries/libfm/libfm_issue_3557764.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f5dd721cd06761af60ea6003fa8832a65df2ea7e Mon Sep 17 00:00:00 2001 -From: Andriy Grytsenko <andrej@rep.kiev.ua> -Date: Thu, 16 Aug 2012 02:45:36 +0300 -Subject: [PATCH] quickfix for #3557764: pcmanfm-1.0 segfault in fm_file_info_is_image - ---- - src/gtk/fm-folder-model.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/src/gtk/fm-folder-model.c b/src/gtk/fm-folder-model.c -index b80aa5c..2406698 100644 ---- a/src/gtk/fm-folder-model.c -+++ b/src/gtk/fm-folder-model.c -@@ -1331,12 +1331,16 @@ static void on_thumbnail_max_changed(FmConfig* cfg, gpointer user_data) - { - FmFolderModel* model = (FmFolderModel*)user_data; - FmThumbnailRequest* req; -- GList* new_reqs = NULL, *l; -+ GList* new_reqs = NULL; - GSequenceIter* seq_it; - FmFileInfo* fi; - guint thumbnail_max_bytes = fm_config->thumbnail_max << 10; - goffset size; - -+#if 0 -+ /* disabled due to bug #3557764: pcmanfm-1.0 segfault in fm_file_info_is_image -+ access to FmThumbnailRequest is dangerous in this implementation -+ and thumbnail generator anyway respects cfg->thumbnail_max */ - if(cfg->thumbnail_max) - { - /* remove files which are too big from thumbnail requests -@@ -1357,6 +1361,7 @@ static void on_thumbnail_max_changed(FmConfig* cfg, gpointer user_data) - l = next; - } - } -+#endif - seq_it = g_sequence_get_begin_iter(model->items); - while( !g_sequence_iter_is_end(seq_it) ) - { --- -1.7.4.1 - |