diff options
| -rw-r--r-- | system/pcmanfm/README | 8 | ||||
| -rw-r--r-- | system/pcmanfm/norootwarning.patch | 23 | ||||
| -rw-r--r-- | system/pcmanfm/pcmanfm.SlackBuild | 11 | ||||
| -rw-r--r-- | system/pcmanfm/pcmanfm.info | 8 | ||||
| -rw-r--r-- | system/pcmanfm/window-resize.patch | 25 |
5 files changed, 37 insertions, 38 deletions
diff --git a/system/pcmanfm/README b/system/pcmanfm/README index 143f851bccc1..a3e427a6f5fe 100644 --- a/system/pcmanfm/README +++ b/system/pcmanfm/README @@ -1,10 +1,8 @@ PCManFM is an extremely fast and lightweight GTK+ based file manager which features tabbed browsing and a user-friendly interface. -To view icons on PCMan File Manager, include this line to your -$HOME/.gtkrc-2.0: gtk-icon-theme-name="Tango" - -pcmanfm warns by default when used by root: you can disable the warning -passing a parameter to the build script, BEND_ME_OVER=kthxbai +If you have problems viewing icons on pcmanfm, include this line to +your $HOME/.gtkrc-2.0: +gtk-icon-theme-name="Tango" This requires libfm. gvfs is an optional runtime dependency. diff --git a/system/pcmanfm/norootwarning.patch b/system/pcmanfm/norootwarning.patch deleted file mode 100644 index bb9bb03c9440..000000000000 --- a/system/pcmanfm/norootwarning.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur pcmanfm-20101129_0f075cf.orig/src/main-win.c pcmanfm-20101129_0f075cf/src/main-win.c ---- pcmanfm-20101129_0f075cf.orig/src/main-win.c 2010-11-29 15:11:45.000000000 +0100 -+++ pcmanfm-20101129_0f075cf/src/main-win.c 2010-12-03 11:05:46.000000000 +0100 -@@ -550,19 +550,6 @@ - /* the location bar */ - self->location = fm_path_entry_new(); - g_signal_connect(self->location, "activate", on_location_activate, self); -- if(geteuid() == 0) /* if we're using root, give the location entry a different color */ -- { -- GtkStyle* style = gtk_rc_get_style_by_paths( -- gtk_settings_get_for_screen(gtk_widget_get_screen(self->location)), -- "gtk-tooltip", NULL, G_TYPE_NONE); -- if(style) -- { -- gtk_widget_modify_base(self->location, GTK_STATE_NORMAL, &style->bg[GTK_STATE_NORMAL]); -- gtk_widget_modify_fg(self->location, GTK_STATE_NORMAL, &style->fg[GTK_STATE_NORMAL]); -- gtk_entry_set_icon_from_stock(GTK_ENTRY(self->location), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_DIALOG_WARNING); -- } -- gtk_entry_set_icon_tooltip_text(GTK_ENTRY(self->location), GTK_ENTRY_ICON_PRIMARY, _("You are in super user mode")); -- } - - toolitem = gtk_tool_item_new(); - gtk_container_add( GTK_CONTAINER(toolitem), self->location ); diff --git a/system/pcmanfm/pcmanfm.SlackBuild b/system/pcmanfm/pcmanfm.SlackBuild index b8d61e7c86d0..967ab5a5e1a4 100644 --- a/system/pcmanfm/pcmanfm.SlackBuild +++ b/system/pcmanfm/pcmanfm.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pcmanfm -VERSION=20110316_9c4603d +VERSION=${VERSION:-0.9.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,12 +73,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# if you want disable root use warning -if [ "$BEND_ME_OVER" = "kthxbai" ]; then - patch -p1 < $CWD/norootwarning.patch -fi +# a small fix from git +patch -p1 < $CWD/window-resize.patch -sh autogen.sh +sh autogen.sh || true CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -88,6 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --disable-debug \ + --disable-static \ --build=$ARCH-slackware-linux make diff --git a/system/pcmanfm/pcmanfm.info b/system/pcmanfm/pcmanfm.info index 83038d7f8b40..6cf6505347c9 100644 --- a/system/pcmanfm/pcmanfm.info +++ b/system/pcmanfm/pcmanfm.info @@ -1,10 +1,10 @@ PRGNAM="pcmanfm" -VERSION="20110316_9c4603d" +VERSION="0.9.10" HOMEPAGE="http://pcmanfm.sourceforge.net" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/pcmanfm-20110316_9c4603d.tar.xz" -MD5SUM="0b3ce79e27ad0c8e6db58861750f0eb7" +DOWNLOAD="http://downloads.sourceforge.net/pcmanfm/pcmanfm-0.9.10.tar.gz" +MD5SUM="d34a3530a6c5dcd674d23021d71c3e95" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="ponce" EMAIL="matteo.bernardini@gmail.com" -APPROVED="rworkman" +APPROVED="Erik Hanson" diff --git a/system/pcmanfm/window-resize.patch b/system/pcmanfm/window-resize.patch new file mode 100644 index 000000000000..968ed4f9a9a1 --- /dev/null +++ b/system/pcmanfm/window-resize.patch @@ -0,0 +1,25 @@ +From 942fd81a00e93fa576f05c6f9a9f52864586f0a0 Mon Sep 17 00:00:00 2001 +From: Hong Jen Yee (PCMan) <pcman.tw@gmail.com> +Date: Mon, 5 Dec 2011 23:39:24 +0800 +Subject: [PATCH] Apply patch #3438582 to fix bug #3325415 - window resize problem. + +--- + src/main-win.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/main-win.c b/src/main-win.c +index c5af013..3d80372 100644 +--- a/src/main-win.c ++++ b/src/main-win.c +@@ -1326,7 +1326,7 @@ gboolean on_button_press_event(GtkWidget* w, GdkEventButton* evt) + act = gtk_ui_manager_get_action(win->ui, "/Next2"); + gtk_action_activate(act); + } +- return TRUE; ++ return GTK_WIDGET_CLASS(fm_main_win_parent_class)->button_press_event(w, evt); + } + + static void on_reload(GtkAction* act, FmMainWin* win) +-- +1.7.4.1 + |