cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update xfe to 1.35. This release features the ability to execute custom

Browse Source 
scripts on files, similar to Nautilus.
This commit is contained in:
bcallah 2013-08-27 01:57:24 +00:00
parent 3ad0ec1e52
commit f9efd200fa
7 changed files with 244 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/xfe/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.29 2013/06/04 18:42:01 naddy Exp $
# $OpenBSD: Makefile,v 1.30 2013/08/27 01:57:24 bcallah Exp $
COMMENT= MS-Explorer like file manager for X
DISTNAME= xfe-1.34
DISTNAME= xfe-1.35
CATEGORIES= x11
HOMEPAGE= http://roland65.free.fr/xfe/

4
x11/xfe/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (xfe-1.34.tar.gz) = XjEbBgk0nKWtLDTTLMt5hj60j2uKn93Ozzfw3TaKz3g=
SIZE (xfe-1.34.tar.gz) = 2356801
SHA256 (xfe-1.35.tar.gz) = nwAcycB6lwOyh0zUFjWxskAs0dfScKtDbT2vABU2mFA=
SIZE (xfe-1.35.tar.gz) = 2447267

14
x11/xfe/patches/patch-Makefile_in
View File

@ -1,12 +1,14 @@
$OpenBSD: patch-Makefile_in,v 1.10 2013/05/09 00:44:06 bcallah Exp $
--- Makefile.in.orig Sat May 4 17:25:03 2013
+++ Makefile.in Sat May 4 17:26:50 2013
@@ -462,15 +462,14 @@ uninstall-iconDATA:
cd "$(DESTDIR)$(icondir)" && rm -f $$files
$OpenBSD: patch-Makefile_in,v 1.11 2013/08/27 01:57:25 bcallah Exp $
--- Makefile.in.orig Sat Aug 24 16:40:21 2013
+++ Makefile.in Sat Aug 24 16:42:24 2013
@@ -507,17 +507,13 @@ uninstall-iconDATA:
install-rcDATA: $(rc_DATA)
@$(NORMAL_INSTALL)
- test -z "$(rcdir)" || $(MKDIR_P) "$(DESTDIR)$(rcdir)"
@list='$(rc_DATA)'; test -n "$(rcdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(rcdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(rcdir)" || exit 1; \
- fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \

8
x11/xfe/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.8 2013/05/09 00:44:06 bcallah Exp $
--- configure.orig Sat May 4 17:27:41 2013
+++ configure Sat May 4 17:30:56 2013
@@ -5637,7 +5637,7 @@ elif test $ac_cv_prog_cxx_g = yes; then
$OpenBSD: patch-configure,v 1.9 2013/08/27 01:57:25 bcallah Exp $
--- configure.orig Mon Aug 19 04:59:59 2013
+++ configure Sat Aug 24 16:44:01 2013
@@ -5677,7 +5677,7 @@ elif test $ac_cv_prog_cxx_g = yes; then
fi
else
if test "$GXX" = yes; then

14
x11/xfe/patches/patch-src_DirList_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_DirList_cpp,v 1.1 2013/05/09 00:44:06 bcallah Exp $
--- src/DirList.cpp.orig Sat May 4 17:34:25 2013
+++ src/DirList.cpp Sat May 4 17:35:03 2013
@@ -1954,8 +1954,10 @@ long DirList::onUpdRefreshTimers(FXObject*,FXSelector,
if (prevMinimized == FALSE && minimized == TRUE)
{
onCmdRefreshTimer(0,0,0);
+#if defined(linux)
onMtdevicesRefresh(0,0,0);
onUpdevicesRefresh(0,0,0);
+#endif
}
return 1;

215
x11/xfe/patches/patch-src_FilePanel_cpp Normal file
View File

@ -0,0 +1,215 @@
$OpenBSD: patch-src_FilePanel_cpp,v 1.1 2013/08/27 01:57:25 bcallah Exp $
Bug reported and already fixed upstream. This patch is from upstream.
--- src/FilePanel.cpp.orig Wed Aug 21 07:32:33 2013
+++ src/FilePanel.cpp Mon Aug 26 15:21:14 2013
@@ -4450,104 +4450,6 @@ long FilePanel::onUpdToggleThumbnails(FXObject* sender
}
-#if defined(linux)
-// Mount/Unmount file systems
-long FilePanel::onCmdMount(FXObject*,FXSelector sel,void*)
-{
- int ret;
- FXString cmd, msg, text;
- unsigned int op;
- File *f;
- FXString dir;
-
- current->list->setFocus();
-
- // Use the selected directory in FilePanel if any
- // or use the selected directory in DirPanel
- if (current->list->getNumSelectedItems()==0)
- dir=current->list->getDirectory();
- else
- {
- for (int u=0; u<current->list->getNumItems(); u++)
- {
- if (current->list->isItemSelected(u))
- dir=current->list->getItemPathname(u);
- }
- }
-
- // If symbolic link, read the linked directory
- if (::isLink(dir))
- dir=::readLink(dir);
-
- if(FXSELID(sel)==ID_MOUNT)
- {
- op=MOUNT;
- msg=_("Mount");
- cmd="mount ";
- }
- else
- {
- op=UNMOUNT;
- msg=_("Unmount");
- cmd="umount ";
- }
- cmd+=::quote(dir);
- cmd+=" 2>&1";
- ret=chdir(ROOTDIR);
- if (ret < 0)
- {
- int errcode=errno;
- if (errcode)
- MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s: %s"),ROOTDIR,strerror(errcode));
- else
- MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s"),ROOTDIR);
-
- return 0;
- }
-
- // Wait cursor
- getApp()->beginWaitCursor();
-
- // File object
- text=msg + _(" file system...");
- f=new File(this,text.text(),op);
- f->create();
-
- // Mount/unmount file system
- text=msg + _(" the folder:");
- f->mount(dir,text,cmd,op);
- ret=chdir(startlocation.text());
- if (ret < 0)
- {
- int errcode=errno;
- if (errcode)
- MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s: %s"),startlocation.text(),strerror(errcode));
- else
- MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s"),startlocation.text());
-
- return 0;
- }
-
- // If action is cancelled in progress dialog
- if (f->isCancelled())
- {
- f->hide();
- text=msg + _(" operation cancelled!");
- MessageBox::error(this,BOX_OK,_("Error"),text.text());
- delete f;
- return 0;
- }
-
- getApp()->endWaitCursor();
- delete f;
-
- // Force panel refresh
- onCmdRefresh(0,0,0);
-
- return 1;
-}
-
-
// Run script
long FilePanel::onCmdRunScript(FXObject* o, FXSelector sel, void*)
{
@@ -4649,6 +4551,103 @@ long FilePanel::onCmdGoScriptDir(FXObject* o, FXSelect
return 1;
}
+
+#if defined(linux)
+// Mount/Unmount file systems
+long FilePanel::onCmdMount(FXObject*,FXSelector sel,void*)
+{
+ int ret;
+ FXString cmd, msg, text;
+ unsigned int op;
+ File *f;
+ FXString dir;
+
+ current->list->setFocus();
+
+ // Use the selected directory in FilePanel if any
+ // or use the selected directory in DirPanel
+ if (current->list->getNumSelectedItems()==0)
+ dir=current->list->getDirectory();
+ else
+ {
+ for (int u=0; u<current->list->getNumItems(); u++)
+ {
+ if (current->list->isItemSelected(u))
+ dir=current->list->getItemPathname(u);
+ }
+ }
+
+ // If symbolic link, read the linked directory
+ if (::isLink(dir))
+ dir=::readLink(dir);
+
+ if(FXSELID(sel)==ID_MOUNT)
+ {
+ op=MOUNT;
+ msg=_("Mount");
+ cmd="mount ";
+ }
+ else
+ {
+ op=UNMOUNT;
+ msg=_("Unmount");
+ cmd="umount ";
+ }
+ cmd+=::quote(dir);
+ cmd+=" 2>&1";
+ ret=chdir(ROOTDIR);
+ if (ret < 0)
+ {
+ int errcode=errno;
+ if (errcode)
+ MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s: %s"),ROOTDIR,strerror(errcode));
+ else
+ MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s"),ROOTDIR);
+
+ return 0;
+ }
+
+ // Wait cursor
+ getApp()->beginWaitCursor();
+
+ // File object
+ text=msg + _(" file system...");
+ f=new File(this,text.text(),op);
+ f->create();
+
+ // Mount/unmount file system
+ text=msg + _(" the folder:");
+ f->mount(dir,text,cmd,op);
+ ret=chdir(startlocation.text());
+ if (ret < 0)
+ {
+ int errcode=errno;
+ if (errcode)
+ MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s: %s"),startlocation.text(),strerror(errcode));
+ else
+ MessageBox::error(this,BOX_OK,_("Error"),_("Can't enter folder %s"),startlocation.text());
+
+ return 0;
+ }
+
+ // If action is cancelled in progress dialog
+ if (f->isCancelled())
+ {
+ f->hide();
+ text=msg + _(" operation cancelled!");
+ MessageBox::error(this,BOX_OK,_("Error"),text.text());
+ delete f;
+ return 0;
+ }
+
+ getApp()->endWaitCursor();
+ delete f;
+
+ // Force panel refresh
+ onCmdRefresh(0,0,0);
+
+ return 1;
+}
// Update the Mount button
long FilePanel::onUpdMount(FXObject* o,FXSelector sel,void*)

14
x11/xfe/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2013/05/09 00:44:06 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.10 2013/08/27 01:57:26 bcallah Exp $
@bin bin/xfe
@bin bin/xfi
@bin bin/xfp
@ -26,6 +26,9 @@ share/locale/es/LC_MESSAGES/xfe.mo
share/locale/es_AR/
share/locale/es_AR/LC_MESSAGES/
share/locale/es_AR/LC_MESSAGES/xfe.mo
share/locale/es_CO/
share/locale/es_CO/LC_MESSAGES/
share/locale/es_CO/LC_MESSAGES/xfe.mo
share/locale/fr/LC_MESSAGES/xfe.mo
share/locale/hu/LC_MESSAGES/xfe.mo
share/locale/it/LC_MESSAGES/xfe.mo
@ -155,6 +158,7 @@ share/xfe/icons/blue-theme/fonts.png
share/xfe/icons/blue-theme/gif_16x16.png
share/xfe/icons/blue-theme/gif_32x32.png
share/xfe/icons/blue-theme/gotobig.png
share/xfe/icons/blue-theme/gotodir.png
share/xfe/icons/blue-theme/gotoline.png
share/xfe/icons/blue-theme/graybutton.png
share/xfe/icons/blue-theme/greenbutton.png
@ -464,6 +468,7 @@ share/xfe/icons/brown-theme/fonts.png
share/xfe/icons/brown-theme/gif_16x16.png
share/xfe/icons/brown-theme/gif_32x32.png
share/xfe/icons/brown-theme/gotobig.png
share/xfe/icons/brown-theme/gotodir.png
share/xfe/icons/brown-theme/gotoline.png
share/xfe/icons/brown-theme/graybutton.png
share/xfe/icons/brown-theme/greenbutton.png
@ -773,6 +778,7 @@ share/xfe/icons/gnome-theme/fonts.png
share/xfe/icons/gnome-theme/gif_16x16.png
share/xfe/icons/gnome-theme/gif_32x32.png
share/xfe/icons/gnome-theme/gotobig.png
share/xfe/icons/gnome-theme/gotodir.png
share/xfe/icons/gnome-theme/gotoline.png
share/xfe/icons/gnome-theme/graybutton.png
share/xfe/icons/gnome-theme/greenbutton.png
@ -1082,6 +1088,7 @@ share/xfe/icons/gnomeblue-theme/fonts.png
share/xfe/icons/gnomeblue-theme/gif_16x16.png
share/xfe/icons/gnomeblue-theme/gif_32x32.png
share/xfe/icons/gnomeblue-theme/gotobig.png
share/xfe/icons/gnomeblue-theme/gotodir.png
share/xfe/icons/gnomeblue-theme/gotoline.png
share/xfe/icons/gnomeblue-theme/graybutton.png
share/xfe/icons/gnomeblue-theme/greenbutton.png
@ -1391,6 +1398,7 @@ share/xfe/icons/kde-theme/fonts.png
share/xfe/icons/kde-theme/gif_16x16.png
share/xfe/icons/kde-theme/gif_32x32.png
share/xfe/icons/kde-theme/gotobig.png
share/xfe/icons/kde-theme/gotodir.png
share/xfe/icons/kde-theme/gotoline.png
share/xfe/icons/kde-theme/graybutton.png
share/xfe/icons/kde-theme/greenbutton.png
@ -1700,6 +1708,7 @@ share/xfe/icons/tango-theme/fonts.png
share/xfe/icons/tango-theme/gif_16x16.png
share/xfe/icons/tango-theme/gif_32x32.png
share/xfe/icons/tango-theme/gotobig.png
share/xfe/icons/tango-theme/gotodir.png
share/xfe/icons/tango-theme/gotoline.png
share/xfe/icons/tango-theme/graybutton.png
share/xfe/icons/tango-theme/greenbutton.png
@ -2009,6 +2018,7 @@ share/xfe/icons/windows-theme/fonts.png
share/xfe/icons/windows-theme/gif_16x16.png
share/xfe/icons/windows-theme/gif_32x32.png
share/xfe/icons/windows-theme/gotobig.png
share/xfe/icons/windows-theme/gotodir.png
share/xfe/icons/windows-theme/gotoline.png
share/xfe/icons/windows-theme/graybutton.png
share/xfe/icons/windows-theme/greenbutton.png
@ -2318,6 +2328,7 @@ share/xfe/icons/xfce-theme/fonts.png
share/xfe/icons/xfce-theme/gif_16x16.png
share/xfe/icons/xfce-theme/gif_32x32.png
share/xfe/icons/xfce-theme/gotobig.png
share/xfe/icons/xfce-theme/gotodir.png
share/xfe/icons/xfce-theme/gotoline.png
share/xfe/icons/xfce-theme/graybutton.png
share/xfe/icons/xfce-theme/greenbutton.png
@ -2627,6 +2638,7 @@ share/xfe/icons/xfe-theme/fonts.png
share/xfe/icons/xfe-theme/gif_16x16.png
share/xfe/icons/xfe-theme/gif_32x32.png
share/xfe/icons/xfe-theme/gotobig.png
share/xfe/icons/xfe-theme/gotodir.png
share/xfe/icons/xfe-theme/gotoline.png
share/xfe/icons/xfe-theme/graybutton.png
share/xfe/icons/xfe-theme/greenbutton.png